* include/unknwn.h: Include windows.h and ole2.h before header

	guard to avoid circular inclusion of COM headers.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index a83e667..c5d5353 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/unknwn.h: Include windows.h and ole2.h before header
+       guard to avoid circular inclusion of COM headers.
+
+2002-12-26  Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
+
+       * include/dde.h (PackDDElParam, UnpackDDElParam,FreeDDElParam,
+       ReuseDDElParam): Use __WIN64 compatible typedefs.
+
 2002-12-26  Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
 
        * include/accctrl.h (ACTRL_ACCESS_ENTRY[AW]): Make

diff --git a/winsup/w32api/include/unknwn.h b/winsup/w32api/include/unknwn.h
index b8f0be5..1ce4254 100644 (file)
--- a/winsup/w32api/include/unknwn.h
+++ b/winsup/w32api/include/unknwn.h
@@ -1,14 +1,14 @@
+#ifndef COM_NO_WINDOWS_H
+#include <windows.h>
+#include <ole2.h>
+#endif
+
 #ifndef _UNKNWN_H
 #define _UNKNWN_H
 #if __GNUC__ >=3
 #pragma GCC system_header
 #endif
 
-#ifndef COM_NO_WINDOWS_H
-#include <windows.h>
-#include <ole2.h>
-#endif
-
 #ifdef __cplusplus
 extern "C"{
 #endif