Added CINTERFACE and NONAMELESSUNION support.

6a3ad422 · Patrik Stridvall · Alexandre Julliard · 14da7b1c · 6a3ad422 · 6a3ad422
Commit 6a3ad422 authored Jun 12, 1999 by Patrik Stridvall Committed by Alexandre Julliard Jun 12, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 14 deletions

commctrl.h include/commctrl.h +3 -3

prsht.h include/prsht.h +3 -3

obj_dataobject.h include/wine/obj_dataobject.h +9 -5

wtypes.h include/wtypes.h +3 -3

No files found.
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -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" {

--- a/include/prsht.h
+++ b/include/prsht.h
@@ -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)

--- a/include/wine/obj_dataobject.h
+++ b/include/wine/obj_dataobject.h
@@ -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;
 };   


--- a/include/wtypes.h
+++ b/include/wtypes.h
@@ -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