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

defined. * windef.h : Ditto.
2000-06-22 18:37:31 +00:00
parent 699dd00b3a
commit 42030c97d7
3 changed files with 10 additions and 0 deletions
--- a/winsup/w32api/include/rpcdce.h
+++ b/winsup/w32api/include/rpcdce.h
@ -8,7 +8,9 @@ extern "C" {

 #define IN
 #define OUT
+#ifndef OPTIONAL
 #define OPTIONAL
+#endif
 #define uuid_t UUID
 #define rpc_binding_handle_t RPC_BINDING_HANDLE
 #define rpc_binding_vector_t RPC_BINDING_VECTOR
--- a/winsup/w32api/include/windef.h
+++ b/winsup/w32api/include/windef.h
@ -41,7 +41,9 @@ extern "C" {
 #endif
 #define IN
 #define OUT
+#ifndef OPTIONAL
 #define OPTIONAL
+#endif

 #ifdef __GNUC__
 #define PACKED __attribute__((packed))