compilation fixes for OpenWatcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,9 +18,8 @@
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_NORLANDER_HEADERS
|
||||
#include <ole2.h>
|
||||
#endif
|
||||
// get IUnknown, REFIID &c
|
||||
#include <ole2.h>
|
||||
|
||||
// ============================================================================
|
||||
// General purpose functions and macros
|
||||
|
@@ -39,16 +39,12 @@
|
||||
|
||||
#include "wx/msw/private.h" // includes <windows.h>
|
||||
|
||||
#if wxUSE_NORLANDER_HEADERS
|
||||
// for some compilers, the entire ole2.h must be included, not only oleauto.h
|
||||
#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
|
||||
#include <ole2.h>
|
||||
#endif
|
||||
|
||||
#include <oleauto.h>
|
||||
|
||||
#ifndef __WIN32__
|
||||
#include <ole2.h>
|
||||
#include <olestd.h>
|
||||
#endif
|
||||
|
||||
#include <shlobj.h>
|
||||
|
||||
#include "wx/msw/ole/oleutils.h"
|
||||
|
@@ -40,15 +40,11 @@
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#if wxUSE_NORLANDER_HEADERS
|
||||
// for some compilers, the entire ole2.h must be included, not only oleauto.h
|
||||
#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
|
||||
#include <ole2.h>
|
||||
#endif
|
||||
|
||||
#ifndef __WIN32__
|
||||
#include <ole2.h>
|
||||
#include <olestd.h>
|
||||
#endif
|
||||
|
||||
#include <oleauto.h>
|
||||
|
||||
#include "wx/msw/ole/oleutils.h"
|
||||
|
Reference in New Issue
Block a user