diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-26 08:05:46 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-26 08:05:46 +0300 |
| commit | aa6ad99be8a625886de3e411bf7ff82e6a416ba7 (patch) | |
| tree | 813f8909bba5e5c2c7aa866518c219e2d4598b14 | |
| parent | 832a8b19cd7a54a0b55e6215f21fd0dae08a1629 (diff) | |
* include/unknwn.h: Include windows.h and ole2.h before header
guard to avoid circular inclusion of COM headers.
| -rw-r--r-- | winsup/w32api/ChangeLog | 10 | ||||
| -rw-r--r-- | winsup/w32api/include/unknwn.h | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index a83e667ae..c5d53539b 100644 --- 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 b8f0be588..1ce42543e 100644 --- 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 |