diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-04 12:29:56 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-04 12:29:56 +0400 |
| commit | 875beea4608c40361a725954d4c1a8c383f1b152 (patch) | |
| tree | 41c5b4c45fd8adad14e1156be929a75c89d27c3a | |
| parent | 3368050f8fce89cc858082070390e17e2df971ca (diff) | |
Let RPC API work with or without windows.h.
* include/rpc.h: Conditionally include <windows.h> before
header guard.
* include/wtypes.h: Include <rpc.h> and <rpcndr.h> before
header guard.
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/rpc.h | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/wtypes.h | 3 |
3 files changed, 15 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 30646f2a7..863531ecb 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2002-07-04 Danny Smith <dannysmith@users.sourceforge.net> + + * include/rpc.h: Conditionally include <windows.h> before + header guard. + * include/wtypes.h: Include <rpc.h> and <rpcndr.h> before + header guard. + + 2002-07-02 Danny Smith <dannysmith@users.sourceforge.net> * include/commctrl.h (WC_*): Remove some duplicate defines. diff --git a/winsup/w32api/include/rpc.h b/winsup/w32api/include/rpc.h index 0d5e1b3b0..0e3df5eaf 100644 --- a/winsup/w32api/include/rpc.h +++ b/winsup/w32api/include/rpc.h @@ -1,12 +1,13 @@ +#ifndef RPC_NO_WINDOWS_H +#include <windows.h> +#endif + #ifndef _RPC_H #define _RPC_H #if __GNUC__ >=3 #pragma GCC system_header #endif -#ifndef RPC_NO_WINDOWS_H -#include <windows.h> -#endif #ifdef __cplusplus extern "C" { #endif diff --git a/winsup/w32api/include/wtypes.h b/winsup/w32api/include/wtypes.h index 936b43fdc..5078d3145 100644 --- a/winsup/w32api/include/wtypes.h +++ b/winsup/w32api/include/wtypes.h @@ -1,3 +1,6 @@ +#include <rpc.h> +#include <rpcndr.h> + #ifndef _WTYPES_H #define _WTYPES_H #if __GNUC__ >=3 |