include: Undefine a few Unicode macros that conflict with interface functions.
This commit is contained in:
parent
e3c5225353
commit
8bb21b710e
|
@ -28,6 +28,11 @@ cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION")
|
||||||
|
|
||||||
import "wtypes.idl";
|
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 HRESULT nsresult;
|
||||||
typedef ULONG nsrefcnt;
|
typedef ULONG nsrefcnt;
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,10 @@ cpp_quote("#define BG_NOTIFY_JOB_ERROR 0x0002")
|
||||||
cpp_quote("#define BG_NOTIFY_DISABLE 0x0004")
|
cpp_quote("#define BG_NOTIFY_DISABLE 0x0004")
|
||||||
cpp_quote("#define BG_NOTIFY_JOB_MODIFICATION 0x0008")
|
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_SIZEIS(maxcount) maxcount
|
||||||
#define BG_ENUM_LENGTHIS(maxcount,lengthptr) lengthptr ? *lengthptr : maxcount
|
#define BG_ENUM_LENGTHIS(maxcount,lengthptr) lengthptr ? *lengthptr : maxcount
|
||||||
|
|
|
@ -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_SHTMLWindow IID_IHTMLWindow2")
|
||||||
cpp_quote("#define SID_SElementBehaviorFactory IID_IElementBehaviorFactory")
|
cpp_quote("#define SID_SElementBehaviorFactory IID_IElementBehaviorFactory")
|
||||||
|
|
||||||
|
cpp_quote("#ifdef WINE_NO_UNICODE_MACROS")
|
||||||
|
cpp_quote("#undef FindText")
|
||||||
|
cpp_quote("#endif")
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
POINTER_GRAVITY_Left,
|
POINTER_GRAVITY_Left,
|
||||||
POINTER_GRAVITY_Right,
|
POINTER_GRAVITY_Right,
|
||||||
|
|
|
@ -18,6 +18,10 @@
|
||||||
|
|
||||||
import "oaidl.idl";
|
import "oaidl.idl";
|
||||||
|
|
||||||
|
cpp_quote("#ifdef WINE_NO_UNICODE_MACROS")
|
||||||
|
cpp_quote("#undef FindText")
|
||||||
|
cpp_quote("#endif")
|
||||||
|
|
||||||
typedef enum tagTomConstants
|
typedef enum tagTomConstants
|
||||||
{
|
{
|
||||||
tomFalse = 0,
|
tomFalse = 0,
|
||||||
|
|
Loading…
Reference in New Issue