Skip to content

W
wine-winehq
Commit 6a3ad422 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files
Options

Added CINTERFACE and NONAMELESSUNION support.

parent 14da7b1c
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 14 deletions
include/commctrl.h
View file @ 6a3ad422
...@@ -12,21 +12,21 @@ ...@@ -12,21 +12,21 @@
/* c++ likes nameless unions whereas c doesnt */ /* c++ likes nameless unions whereas c doesnt */
/* (used in property sheet structures) */ /* (used in property sheet structures) */
#ifdef __cplusplus #if defined(__cplusplus) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME #define DUMMYUNIONNAME
#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME1
#define DUMMYUNIONNAME2 #define DUMMYUNIONNAME2
#define DUMMYUNIONNAME3 #define DUMMYUNIONNAME3
#define DUMMYUNIONNAME4 #define DUMMYUNIONNAME4
#define DUMMYUNIONNAME5 #define DUMMYUNIONNAME5
#else #else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u #define DUMMYUNIONNAME u
#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME1 u1
#define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME2 u2
#define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME3 u3
#define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME4 u4
#define DUMMYUNIONNAME5 u5 #define DUMMYUNIONNAME5 u5
#endif #endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
include/prsht.h
View file @ 6a3ad422
...@@ -31,21 +31,21 @@ typedef BOOL (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPA ...@@ -31,21 +31,21 @@ typedef BOOL (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPA
/* c++ likes nameless unions whereas c doesnt */ /* c++ likes nameless unions whereas c doesnt */
/* (used in property sheet structures) */ /* (used in property sheet structures) */
#ifdef __cplusplus #if defined(__cplusplus) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME #define DUMMYUNIONNAME
#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME1
#define DUMMYUNIONNAME2 #define DUMMYUNIONNAME2
#define DUMMYUNIONNAME3 #define DUMMYUNIONNAME3
#define DUMMYUNIONNAME4 #define DUMMYUNIONNAME4
#define DUMMYUNIONNAME5 #define DUMMYUNIONNAME5
#else #else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u #define DUMMYUNIONNAME u
#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME1 u1
#define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME2 u2
#define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME3 u3
#define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME4 u4
#define DUMMYUNIONNAME5 u5 #define DUMMYUNIONNAME5 u5
#endif #endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
/* /*
* Property sheet support (structures) * Property sheet support (structures)
......
include/wine/obj_dataobject.h
View file @ 6a3ad422
...@@ -7,11 +7,15 @@ ...@@ -7,11 +7,15 @@
#ifndef __WINE_WINE_OBJ_DATAOBJECT_H #ifndef __WINE_WINE_OBJ_DATAOBJECT_H
#define __WINE_WINE_OBJ_DATAOBJECT_H #define __WINE_WINE_OBJ_DATAOBJECT_H
#if defined(__cplusplus) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME
#else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u
#endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#ifdef __cplusplus #ifdef __cplusplus
#define DUMMY_UNION_NAME extern "C" {
#else #endif /* defined(__cplusplus) */
#define DUMMY_UNION_NAME u
#endif
/***************************************************************************** /*****************************************************************************
* Predeclare the structures * Predeclare the structures
...@@ -118,7 +122,7 @@ struct STGMEDIUM ...@@ -118,7 +122,7 @@ struct STGMEDIUM
LPOLESTR lpszFileName; LPOLESTR lpszFileName;
IStream *pstm; IStream *pstm;
IStorage *pstg; IStorage *pstg;
} DUMMY_UNION_NAME; } DUMMYUNIONNAME;
IUnknown *pUnkForRelease; IUnknown *pUnkForRelease;
}; };
......
include/wtypes.h
View file @ 6a3ad422
...@@ -51,17 +51,17 @@ typedef GUID *LPGUID; ...@@ -51,17 +51,17 @@ typedef GUID *LPGUID;
typedef GUID CLSID,*LPCLSID; typedef GUID CLSID,*LPCLSID;
typedef GUID IID,*LPIID; typedef GUID IID,*LPIID;
typedef GUID FMTID,*LPFMTID; typedef GUID FMTID,*LPFMTID;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
#define REFGUID const GUID & #define REFGUID const GUID &
#define REFCLSID const CLSID & #define REFCLSID const CLSID &
#define REFIID const IID & #define REFIID const IID &
#define REFFMTID const FMTID & #define REFFMTID const FMTID &
#else /* !defined(__cplusplus) */ #else /* !defined(__cplusplus) && !defined(CINTERFACE) */
#define REFGUID const GUID* const #define REFGUID const GUID* const
#define REFCLSID const CLSID* const #define REFCLSID const CLSID* const
#define REFIID const IID* const #define REFIID const IID* const
#define REFFMTID const FMTID* const #define REFFMTID const FMTID* const
#endif /* !defined(__cplusplus) */ #endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
extern const IID GUID_NULL; extern const IID GUID_NULL;
#define IID_NULL GUID_NULL #define IID_NULL GUID_NULL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment