* rpcdce.h: Protect OPTIONAL definition since it may be (legally) previously

defined.
* windef.h : Ditto.
This commit is contained in:
Christopher Faylor 2000-06-22 18:37:31 +00:00
parent 699dd00b3a
commit 42030c97d7
3 changed files with 10 additions and 0 deletions
winsup/w32api

@ -1,3 +1,9 @@
Thu Jun 22 14:36:19 2000 Christopher Faylor <cgf@cygnus.com>
* rpcdce.h: Protect OPTIONAL definition since it may be (legally)
previously defined.
* windef.h : Ditto.
2000-06-14 Kazuhiro Fujieda <fujieda@jaist.ac.jp> 2000-06-14 Kazuhiro Fujieda <fujieda@jaist.ac.jp>
* include/winnt.h: Add some missing defines related to locale * include/winnt.h: Add some missing defines related to locale

@ -8,7 +8,9 @@ extern "C" {
#define IN #define IN
#define OUT #define OUT
#ifndef OPTIONAL
#define OPTIONAL #define OPTIONAL
#endif
#define uuid_t UUID #define uuid_t UUID
#define rpc_binding_handle_t RPC_BINDING_HANDLE #define rpc_binding_handle_t RPC_BINDING_HANDLE
#define rpc_binding_vector_t RPC_BINDING_VECTOR #define rpc_binding_vector_t RPC_BINDING_VECTOR

@ -41,7 +41,9 @@ extern "C" {
#endif #endif
#define IN #define IN
#define OUT #define OUT
#ifndef OPTIONAL
#define OPTIONAL #define OPTIONAL
#endif
#ifdef __GNUC__ #ifdef __GNUC__
#define PACKED __attribute__((packed)) #define PACKED __attribute__((packed))