For C++, declare initialised GUIDs to be "extern const" rather than

just "const" to ensure that the initialised GUID is visible to other modules, and use EXTERN_C rather than just "extern" for the benefit of MSVC++, which does name mangling on global variables.

For C++, declare initialised GUIDs to be "extern const" rather than
7d19bf5d · Troy Rollo · Alexandre Julliard · 1aad8088 · 7d19bf5d
Commit 7d19bf5d authored Sep 02, 2005 by Troy Rollo Committed by Alexandre Julliard Sep 02, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

guiddef.h include/guiddef.h +7 -1

No files found.
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -35,12 +35,18 @@ typedef const GUID *LPCGUID;
 #undef DEFINE_GUID

 #ifdef INITGUID
+#ifdef __cplusplus
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        EXTERN_C const GUID name = \
+	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+#else
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
        const GUID name = \
 	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+#endif
 #else
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    extern const GUID name
+    EXTERN_C const GUID name
 #endif

 #define DEFINE_OLEGUID(name, l, w1, w2) \