* include/objbase.h: Include rpc.h and rpcndr.h

	before header guard.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 28a668a..58d91f6 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-13  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/objbase.h: Include rpc.h and rpcndr.h
+       before header guard.
+
 2002-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/olectl.h (PROPPAGEINFO): Change type of

diff --git a/winsup/w32api/include/objbase.h b/winsup/w32api/include/objbase.h
index a1b0e57..0af2b21 100644 (file)
--- a/winsup/w32api/include/objbase.h
+++ b/winsup/w32api/include/objbase.h
@@ -1,11 +1,14 @@
+/* Include here to prevent circular dependencies if windows.h
+   not already included */
+#include <rpc.h>
+#include <rpcndr.h>
+
 #ifndef _OBJBASE_H
 #define _OBJBASE_H
 #if __GNUC__ >=3
 #pragma GCC system_header
 #endif
 
-#include <rpc.h>
-#include <rpcndr.h>
 #include <stdlib.h>
 #pragma pack(push,8)
 #include <basetyps.h>