diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-06-22 18:37:31 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-06-22 18:37:31 +0000 |
| commit | 42030c97d70b39d55bc09b4f56e255c892df6b13 (patch) | |
| tree | 7bbff07014b2a34c6f4c6ecc3689775ab123782f | |
| parent | 699dd00b3a94cdc0f47b98c421d28f8912d50e0a (diff) | |
| download | cygnal-42030c97d70b39d55bc09b4f56e255c892df6b13.tar.gz cygnal-42030c97d70b39d55bc09b4f56e255c892df6b13.tar.bz2 cygnal-42030c97d70b39d55bc09b4f56e255c892df6b13.zip | |
* rpcdce.h: Protect OPTIONAL definition since it may be (legally) previously
defined.
* windef.h : Ditto.
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/rpcdce.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/windef.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 425b4ebb6..07661ed9a 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -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> * include/winnt.h: Add some missing defines related to locale diff --git a/winsup/w32api/include/rpcdce.h b/winsup/w32api/include/rpcdce.h index 97d93ce59..e07fa3a9d 100644 --- 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 diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h index 433cacfbb..129a9a7d7 100644 --- 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)) |