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

guard to avoid circular inclusion of COM headers.
This commit is contained in:
Danny Smith 2002-12-26 05:05:46 +00:00
parent 832a8b19cd
commit aa6ad99be8
2 changed files with 15 additions and 5 deletions

View File

@ -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> 2002-12-26 Dimitri Papadopoulos <dimitri_at@sourceforge.users.net>
* include/accctrl.h (ACTRL_ACCESS_ENTRY[AW]): Make * include/accctrl.h (ACTRL_ACCESS_ENTRY[AW]): Make

View File

@ -1,14 +1,14 @@
#ifndef COM_NO_WINDOWS_H
#include <windows.h>
#include <ole2.h>
#endif
#ifndef _UNKNWN_H #ifndef _UNKNWN_H
#define _UNKNWN_H #define _UNKNWN_H
#if __GNUC__ >=3 #if __GNUC__ >=3
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#ifndef COM_NO_WINDOWS_H
#include <windows.h>
#include <ole2.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C"{ extern "C"{
#endif #endif