Alexandre Julliard : include: Undefine a few Unicode macros that conflict with interface functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8bb21b710ead4f2d8a83b070c5f19c11d52a3808
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8bb21b710ead4f2d8a83b070c5...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Feb  9 12:41:45 2009 +0100

include: Undefine a few Unicode macros that conflict with interface functions.

---

 dlls/mshtml/nsiface.idl |    5 +++++
 include/bits.idl        |    4 ++++
 include/mshtml.idl      |    4 ++++
 include/tom.idl         |    4 ++++
 4 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index ef64145..894bb41 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -28,6 +28,11 @@ cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION")
 
 import "wtypes.idl";
 
+cpp_quote("#ifdef WINE_NO_UNICODE_MACROS")
+cpp_quote("#undef GetForm")
+cpp_quote("#undef SetPort")
+cpp_quote("#endif")
+
 typedef HRESULT nsresult;
 typedef ULONG nsrefcnt;
 
diff --git a/include/bits.idl b/include/bits.idl
index 386d6c0..89b916d 100644
--- a/include/bits.idl
+++ b/include/bits.idl
@@ -30,6 +30,10 @@ cpp_quote("#define BG_NOTIFY_JOB_ERROR 0x0002")
 cpp_quote("#define BG_NOTIFY_DISABLE 0x0004")
 cpp_quote("#define BG_NOTIFY_JOB_MODIFICATION 0x0008")
 
+cpp_quote("#ifdef WINE_NO_UNICODE_MACROS")
+cpp_quote("#undef EnumJobs")
+cpp_quote("#undef GetJob")
+cpp_quote("#endif")
 
 #define BG_ENUM_SIZEIS(maxcount) maxcount
 #define BG_ENUM_LENGTHIS(maxcount,lengthptr) lengthptr ? *lengthptr : maxcount
diff --git a/include/mshtml.idl b/include/mshtml.idl
index acbdde2..929139a 100644
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -33,6 +33,10 @@ cpp_quote("DEFINE_GUID(SID_SHTMLEditServices,   0x3050f7f9,0x98b5,0x11cf,0xbb,0x
 cpp_quote("#define SID_SHTMLWindow IID_IHTMLWindow2")
 cpp_quote("#define SID_SElementBehaviorFactory IID_IElementBehaviorFactory")
 
+cpp_quote("#ifdef WINE_NO_UNICODE_MACROS")
+cpp_quote("#undef FindText")
+cpp_quote("#endif")
+
 typedef enum {
     POINTER_GRAVITY_Left,
     POINTER_GRAVITY_Right,
diff --git a/include/tom.idl b/include/tom.idl
index 669fbcf..f86c885 100644
--- a/include/tom.idl
+++ b/include/tom.idl
@@ -18,6 +18,10 @@
 
 import "oaidl.idl";
 
+cpp_quote("#ifdef WINE_NO_UNICODE_MACROS")
+cpp_quote("#undef FindText")
+cpp_quote("#endif")
+
 typedef enum tagTomConstants
 {
     tomFalse       = 0,