marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added CINTERFACE and NONAMELESSUNION support.

oldstable
Patrik Stridvall 1999-06-12 11:05:29 +00:00 committed by Alexandre Julliard
parent 14da7b1c93
commit 6a3ad42293
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/commctrl.h
View File

@ -12,21 +12,21 @@
/* c++ likes nameless unions whereas c doesnt */
/* (used in property sheet structures) */
#ifdef __cplusplus
#if defined(__cplusplus) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME
#define DUMMYUNIONNAME1
#define DUMMYUNIONNAME2
#define DUMMYUNIONNAME3
#define DUMMYUNIONNAME4
#define DUMMYUNIONNAME5
#else
#else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u
#define DUMMYUNIONNAME1 u1
#define DUMMYUNIONNAME2 u2
#define DUMMYUNIONNAME3 u3
#define DUMMYUNIONNAME4 u4
#define DUMMYUNIONNAME5 u5
#endif
#endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#ifdef __cplusplus
extern "C" {

6
include/prsht.h
View File

@ -31,21 +31,21 @@ typedef BOOL (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPA
/* c++ likes nameless unions whereas c doesnt */
/* (used in property sheet structures) */
#ifdef __cplusplus
#if defined(__cplusplus) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME
#define DUMMYUNIONNAME1
#define DUMMYUNIONNAME2
#define DUMMYUNIONNAME3
#define DUMMYUNIONNAME4
#define DUMMYUNIONNAME5
#else
#else /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u
#define DUMMYUNIONNAME1 u1
#define DUMMYUNIONNAME2 u2
#define DUMMYUNIONNAME3 u3
#define DUMMYUNIONNAME4 u4
#define DUMMYUNIONNAME5 u5
#endif
#endif /* defined(__cplusplus) && !defined(NONAMELESSUNION) */
/*
* Property sheet support (structures)

14
include/wine/obj_dataobject.h
View File

@ -7,11 +7,15 @@
#ifndef __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
#define DUMMY_UNION_NAME
#else
#define DUMMY_UNION_NAME u
#endif
extern "C" {
#endif /* defined(__cplusplus) */
/*****************************************************************************
* Predeclare the structures
@ -118,7 +122,7 @@ struct STGMEDIUM
LPOLESTR lpszFileName;
IStream *pstm;
IStorage *pstg;
} DUMMY_UNION_NAME;
} DUMMYUNIONNAME;
IUnknown *pUnkForRelease;
};

6
include/wtypes.h
View File

@ -51,17 +51,17 @@ typedef GUID *LPGUID;
typedef GUID CLSID,*LPCLSID;
typedef GUID IID,*LPIID;
typedef GUID FMTID,*LPFMTID;
#ifdef __cplusplus
#if defined(__cplusplus) && !defined(CINTERFACE)
#define REFGUID const GUID &
#define REFCLSID const CLSID &
#define REFIID const IID &
#define REFFMTID const FMTID &
#else /* !defined(__cplusplus) */
#else /* !defined(__cplusplus) && !defined(CINTERFACE) */
#define REFGUID const GUID* const
#define REFCLSID const CLSID* const
#define REFIID const IID* const
#define REFFMTID const FMTID* const
#endif /* !defined(__cplusplus) */
#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
extern const IID GUID_NULL;
#define IID_NULL GUID_NULL