From cef5961d2b884b672e981ea9abb806162124eece Mon Sep 17 00:00:00 2001 From: "Dimitrie O. Paun" Date: Fri, 3 Jan 2003 19:12:55 +0000 Subject: [PATCH] Eliminate lots of __WINE__ conditionals from the headers. --- dlls/avicap32/avicap32_main.c | 1 + dlls/avifil32/acmstream.c | 1 + dlls/avifil32/api.c | 1 + dlls/avifil32/avifile.c | 1 + dlls/avifil32/extrachunk.c | 1 + dlls/avifil32/factory.c | 1 + dlls/avifil32/getframe.c | 1 + dlls/avifil32/icmstream.c | 1 + dlls/avifil32/wavfile.c | 1 + dlls/comcat/comcat_private.h | 1 + dlls/comctl32/animate.c | 1 + dlls/commdlg/cdlg.h | 1 + dlls/commdlg/filedlgbrowser.h | 1 + dlls/dplayx/Makefile.in | 1 + dlls/msvideo/mciwnd.c | 1 + dlls/msvideo/msrle32/msrle_private.h | 1 + dlls/msvideo/msvideo16.c | 1 + dlls/msvideo/msvideo_private.h | 1 + dlls/ole32/Makefile.in | 2 +- dlls/ole32/compositemoniker.c | 5 +++-- dlls/oleaut32/Makefile.in | 2 +- dlls/oledlg/oledlg_main.c | 4 +--- dlls/olepro32/olepro32stubs.c | 1 + dlls/rpcrt4/Makefile.in | 2 +- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/shdocvw_main.c | 2 +- dlls/shell32/Makefile.in | 2 +- dlls/shlwapi/ordinal.c | 1 + dlls/shlwapi/string.c | 1 + dlls/urlmon/umon.c | 1 + dlls/winmm/mciavi/private_mciavi.h | 1 + dlls/x11drv/event.c | 1 + include/comcat.h | 2 -- include/docobj.h | 2 -- include/mapicode.h | 2 -- include/mapidefs.h | 2 -- include/mediaobj.h | 2 -- include/oaidl.h | 2 -- include/ocidl.h | 4 ---- include/ole2.h | 3 --- include/oleidl.h | 3 --- include/servprov.h | 2 -- include/urlmon.h | 2 -- include/wingdi.h | 6 +++--- include/winnls.h | 4 ++-- include/winuser.h | 4 ++-- ole/dx8guid.c | 1 + ole/dxguid.c | 1 + ole/uuid.c | 1 + 49 files changed, 44 insertions(+), 43 deletions(-) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 5256d73a927..4b40bfc2e44 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "vfw.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 771b0c4ca08..5ea1c4e8216 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 60ac382fe0b..f0d052aefca 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index a1afa0deeda..9ec9d2ebe12 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -26,6 +26,7 @@ * - IAVIStream_fnSetInfo: a stub. */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c index cf70c5c9b96..11657339a94 100644 --- a/dlls/avifil32/extrachunk.c +++ b/dlls/avifil32/extrachunk.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "extrachunk.h" diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 93bee30070c..d148980b93c 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index e4f0d75a297..ee0960798c8 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 7b738774aac..c37d7e5c298 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 6730c5e67ba..9ce1c92d303 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" diff --git a/dlls/comcat/comcat_private.h b/dlls/comcat/comcat_private.h index 2d8e3a227fd..4b66aede534 100644 --- a/dlls/comcat/comcat_private.h +++ b/dlls/comcat/comcat_private.h @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 01ae3155386..5d60fab7011 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -28,6 +28,7 @@ * - concurrent access to infoPtr */ +#define COM_NO_WINDOWS_H #include #include "winbase.h" #include "commctrl.h" diff --git a/dlls/commdlg/cdlg.h b/dlls/commdlg/cdlg.h index fe7d625f6a8..8d5b492ad93 100644 --- a/dlls/commdlg/cdlg.h +++ b/dlls/commdlg/cdlg.h @@ -21,6 +21,7 @@ #ifndef _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H +#define COM_NO_WINDOWS_H #include "dlgs.h" #include "wine/windef16.h" #include "wownt32.h" diff --git a/dlls/commdlg/filedlgbrowser.h b/dlls/commdlg/filedlgbrowser.h index d3238fc2bb4..189eb347f28 100644 --- a/dlls/commdlg/filedlgbrowser.h +++ b/dlls/commdlg/filedlgbrowser.h @@ -22,6 +22,7 @@ #ifndef SHBROWSER_H #define SHBROWSER_H +#define COM_NO_WINDOWS_H #include "shlobj.h" #include "winbase.h" #include "objbase.h" diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 6ac33fe1b05..bd605f7ecdb 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/msvideo/mciwnd.c b/dlls/msvideo/mciwnd.c index fded32419e3..c3606eeda63 100644 --- a/dlls/msvideo/mciwnd.c +++ b/dlls/msvideo/mciwnd.c @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include diff --git a/dlls/msvideo/msrle32/msrle_private.h b/dlls/msvideo/msrle32/msrle_private.h index a78976d5d68..e254aace1dd 100644 --- a/dlls/msvideo/msrle32/msrle_private.h +++ b/dlls/msvideo/msrle32/msrle_private.h @@ -19,6 +19,7 @@ #ifndef __MSRLE32_PRIVATE_H #define __MSRLE32_PRIVATE_H +#define COM_NO_WINDOWS_H #include "winbase.h" #include "mmsystem.h" #include "vfw.h" diff --git a/dlls/msvideo/msvideo16.c b/dlls/msvideo/msvideo16.c index ede5e28239d..af639b5f1f2 100644 --- a/dlls/msvideo/msvideo16.c +++ b/dlls/msvideo/msvideo16.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include diff --git a/dlls/msvideo/msvideo_private.h b/dlls/msvideo/msvideo_private.h index ac5fa38efbc..29ae68e057a 100644 --- a/dlls/msvideo/msvideo_private.h +++ b/dlls/msvideo/msvideo_private.h @@ -19,6 +19,7 @@ #ifndef __WINE_MSVIDEO_PRIVATE_H #define __WINE_MSVIDEO_PRIVATE_H +#define COM_NO_WINDOWS_H #include "winbase.h" #include "windef.h" #include "vfw.h" diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 902f47aee9a..1c589120789 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_OLE32_ +EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index f3731fe5c00..ed266f6427e 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1,4 +1,4 @@ -/*************************************************************************************** +/* * CompositeMonikers implementation * * Copyright 1999 Noomen Hamza @@ -16,7 +16,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - ***************************************************************************************/ + */ + #include #include #include "winbase.h" diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 76d7a5b84fb..3a24b40d130 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_OLEAUT32_ +EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 98857565308..66525be9a79 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -289,6 +290,3 @@ UINT WINAPI OleUIChangeSourceW( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return OLEUI_FALSE; } - - - diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index c6c08ac869c..5a6430a6763 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "wine/debug.h" #include "winbase.h" #include "ole2.h" diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 005c938c847..8a964305dda 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_RPCRT4_ +EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index c5c2bf541d6..e1752237636 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -21,6 +21,7 @@ #ifndef __WINE_SHDOCVW_H #define __WINE_SHDOCVW_H +#define COM_NO_WINDOWS_H /* FIXME: Is there a better way to deal with all these includes? */ #include "wingdi.h" #include "winbase.h" diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 318ce2155fc..6b51457f34b 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "winreg.h" #include "initguid.h" @@ -94,4 +95,3 @@ HRESULT WINAPI SHDOCVW_DllUnregisterServer() FIXME("(), stub!\n"); return S_OK; } - diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index c4f5931bc53..1e59c2a24a0 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHELL32_ +EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 719035c6281..e6d2c361c88 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "config.h" #include "wine/port.h" diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index fe466eb28d9..2428e3d6fea 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "config.h" #include "wine/port.h" diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 1ae00d252ea..3004b2d3f13 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -23,6 +23,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include #include "windef.h" diff --git a/dlls/winmm/mciavi/private_mciavi.h b/dlls/winmm/mciavi/private_mciavi.h index e1d2ee65b84..a4bdf4bc82e 100644 --- a/dlls/winmm/mciavi/private_mciavi.h +++ b/dlls/winmm/mciavi/private_mciavi.h @@ -23,6 +23,7 @@ #ifndef __WINE_PRIVATE_MCIAVI_H #define __WINE_PRIVATE_MCIAVI_H +#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c index 261e5ae1cee..dfae906c437 100644 --- a/dlls/x11drv/event.c +++ b/dlls/x11drv/event.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "config.h" #include diff --git a/include/comcat.h b/include/comcat.h index 7f238edec0a..b82b11ec54a 100644 --- a/include/comcat.h +++ b/include/comcat.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __WINE_COMCAT_H #define __WINE_COMCAT_H diff --git a/include/docobj.h b/include/docobj.h index 4cbdaef421c..4d820f24698 100644 --- a/include/docobj.h +++ b/include/docobj.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __WINE_DOCOBJ_H #define __WINE_DOCOBJ_H diff --git a/include/mapicode.h b/include/mapicode.h index 702eef20cba..57346d62822 100644 --- a/include/mapicode.h +++ b/include/mapicode.h @@ -21,9 +21,7 @@ #ifndef MAPICODE_H #define MAPICODE_H -#ifndef __WINE__ #include "winerror.h" -#endif #define MAKE_MAPI_SCODE(sev,fac,code) \ ( (((ULONG)(sev)<<31) | ((ULONG)(fac)<<16) | ((ULONG)(code))) ) diff --git a/include/mapidefs.h b/include/mapidefs.h index 10ca3fc282b..92d1c0fd103 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -20,13 +20,11 @@ #define __WINE_MAPIDEFS_H #include "windef.h" -#ifndef __WINE__ #include "windows.h" #include "winerror.h" #ifndef _OBJBASE_H_ #include "objbase.h" #endif -#endif /* Some types */ diff --git a/include/mediaobj.h b/include/mediaobj.h index 58ec373fd54..1be544873aa 100644 --- a/include/mediaobj.h +++ b/include/mediaobj.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __mediaobj_h__ #define __mediaobj_h__ diff --git a/include/oaidl.h b/include/oaidl.h index cfc31501aa0..e3e42d8141f 100644 --- a/include/oaidl.h +++ b/include/oaidl.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __WINE_OAIDL_H #define __WINE_OAIDL_H diff --git a/include/ocidl.h b/include/ocidl.h index 0c4b4a927b7..6e007a8f5de 100644 --- a/include/ocidl.h +++ b/include/ocidl.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __WINE_OCIDL_H #define __WINE_OCIDL_H @@ -46,5 +44,3 @@ #include "wine/obj_oleundo.h" #endif /* __WINE_OCIDL_H */ - - diff --git a/include/ole2.h b/include/ole2.h index 4bde59d91dc..7e0296b0335 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -27,9 +27,7 @@ #define __WINE_INCLUDE_OLEIDL #include "oleidl.h" #undef __WINE_INCLUDE_OLEIDL -#ifndef __WINE__ #include "oleauto.h" -#endif struct tagMSG; #ifdef __cplusplus @@ -150,4 +148,3 @@ HRESULT WINAPI OleSetAutoConvert( REFCLSID clsidOld, REFCLSID clsidNew ); #endif /* defined(__cplusplus) */ #endif /* __WINE_OLE2_H */ - diff --git a/include/oleidl.h b/include/oleidl.h index d5e0e56c438..1fe96d170b6 100644 --- a/include/oleidl.h +++ b/include/oleidl.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __WINE_OLEIDL_H #define __WINE_OLEIDL_H @@ -40,4 +38,3 @@ #include "wine/obj_dragdrop.h" #endif /* __WINE_OLEIDL_H */ - diff --git a/include/servprov.h b/include/servprov.h index a149ace258d..cfbd81d9f59 100644 --- a/include/servprov.h +++ b/include/servprov.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __WINE_SERVPROV_H #define __WINE_SERVPROV_H diff --git a/include/urlmon.h b/include/urlmon.h index c19548f9321..66084498d07 100644 --- a/include/urlmon.h +++ b/include/urlmon.h @@ -16,14 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE__ #include "rpc.h" #include "rpcndr.h" #ifndef COM_NO_WINDOWS_H #include "windows.h" #include "ole2.h" #endif -#endif #ifndef __WINE_URLMON_H #define __WINE_URLMON_H diff --git a/include/wingdi.h b/include/wingdi.h index 5f02ca56e69..0b8fa887175 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1166,7 +1166,7 @@ typedef struct DECL_WINELIB_TYPE_AW(NEWTEXTMETRICEX) -#if defined(STRICT) || defined(__WINE__) +#if defined(STRICT) #if !defined(NOTEXTMETRIC) typedef int (CALLBACK *OLDFONTENUMPROCA)(const LOGFONTA *, const TEXTMETRICA *, DWORD, LPARAM); @@ -1184,7 +1184,7 @@ DECL_WINELIB_TYPE_AW(FONTENUMPROC) typedef INT (CALLBACK *GOBJENUMPROC)(LPVOID, LPARAM); typedef VOID (CALLBACK *LINEDDAPROC)(INT, INT, LPARAM); -#else /* defined(STRICT) || defined(__WINE__) */ +#else /* defined(STRICT) */ typedef FARPROC OLDFONTENUMPROC; @@ -1195,7 +1195,7 @@ DECL_WINELIB_TYPE_AW(FONTENUMPROC) typedef FARPROC GOBJENUMPROC; typedef FARPROC LINEDDAPROC; -#endif /* defined(STRICT) || defined(__WINE__) */ +#endif /* defined(STRICT) */ /* tmPitchAndFamily bits */ #define TMPF_FIXED_PITCH 1 /* means variable pitch */ diff --git a/include/winnls.h b/include/winnls.h index 001671bca0e..db0c880984d 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -425,7 +425,7 @@ DECL_WINELIB_TYPE_AW(LPCURRENCYFMT) /* Define a bunch of callback types */ -#if defined(STRICT) || defined(__WINE__) +#if defined(STRICT) typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR); typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXA)(LPSTR,CALID); @@ -455,7 +455,7 @@ typedef FARPROC LOCALE_ENUMPROCA; typedef FARPROC LOCALE_ENUMPROCW; typedef FARPROC TIMEFMT_ENUMPROCA; typedef FARPROC TIMEFMT_ENUMPROCW; -#endif /* STRICT || __WINE__ */ +#endif /* STRICT */ DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROC) DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROCEX) diff --git a/include/winuser.h b/include/winuser.h index b2877d4fe25..2caebb87147 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -29,7 +29,7 @@ extern "C" { /* Define a bunch of callback types */ -#if defined(STRICT) || defined(__WINE__) +#if defined(STRICT) typedef INT_PTR (CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef BOOL (CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int); typedef INT (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT); @@ -65,7 +65,7 @@ typedef FARPROC SENDASYNCPROC; typedef FARPROC TIMERPROC; typedef FARPROC WINEVENTPROC; typedef FARPROC WNDENUMPROC; -#endif /* STRICT || __WINE__ */ +#endif /* STRICT */ typedef NAMEENUMPROCA WINSTAENUMPROCA; typedef NAMEENUMPROCA DESKTOPENUMPROCA; diff --git a/ole/dx8guid.c b/ole/dx8guid.c index 841716717b9..7ac970018ef 100644 --- a/ole/dx8guid.c +++ b/ole/dx8guid.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/ole/dxguid.c b/ole/dxguid.c index 5df154f5d9e..fb6e9789ad8 100644 --- a/ole/dxguid.c +++ b/ole/dxguid.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/ole/uuid.c b/ole/uuid.c index 4f9ded30f14..22278c5acf1 100644 --- a/ole/uuid.c +++ b/ole/uuid.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COM_NO_WINDOWS_H #include "initguid.h" /* GUIDs defined in uuids.lib */ -- 2.11.4.GIT