* include/windows.h: Don't include basetyps.h.

	* include/objfwd.h: Do include basetyps.h.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 58d91f6301b30415dceeb571602f97ee27d25346..5fd4749d50c8f821622f8a33909882dc0601dd67 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-14  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/windows.h: Don't include basetyps.h.
+       * include/objfwd.h: Do include basetyps.h.
+
 2002-10-13  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/objbase.h: Include rpc.h and rpcndr.h

diff --git a/winsup/w32api/include/objfwd.h b/winsup/w32api/include/objfwd.h
index 17b8a811152fb22159a04eddaa475ddc11dd1f9f..8fede73aa89c8d08734ba7041c7a7e453a64c98f 100644 (file)
--- a/winsup/w32api/include/objfwd.h
+++ b/winsup/w32api/include/objfwd.h
@@ -4,6 +4,8 @@
 #pragma GCC system_header
 #endif
 
+#include <basetyps.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index b5dfc7b9337a6987b9d5f3a5dbfdf42fbc2e0ee5..e7d00b423f8e6175b178b15eddf2bca82f9cea4c 100644 (file)
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -47,7 +47,6 @@
 #include <stdarg.h>
 #include <windef.h>
 #include <wincon.h>
-#include <basetyps.h>
 #include <winbase.h>
 #ifndef _WINGDI_H
 #include <wingdi.h>