Changeset 21515 for trunk/include

Timestamp:

Dec 7, 2010, 1:41:12 PM (15 years ago)

Author:

dmik

Message:

Prevent underscore in GUID constants on EMX.

File:

• trunk/include/win/guiddef.h (modified) (1 diff)

trunk/include/win/guiddef.h

@@ -39 +39 @@
 
 #ifdef INITGUID
+#ifdef __EMX__
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+    extern const GUID name asm(#name); /* suppress underscore */ \
+    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) \
     extern const GUID name = \
-        { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+        { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+#endif
+#else /* INITGUID */
+#ifdef __EMX__
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+    extern const GUID name asm(#name) /* suppress underscore */
 #else
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
     extern const GUID name
+#endif
 #endif