Changeset 22089 for branches/swt/include

Timestamp:

Mar 16, 2015, 3:09:49 PM (11 years ago)

Author:

rousseau

Message:

Probably fixed duplicate symbols with OLE ID's

On Win32 these symbols are generated in the '.data' section of the
resulting COFF32 object-module. Linking them does not introduce
duplicate symbol definitions.

On OS/2 they are generated in the '.text' section of the resulting a.out
object-module. This causes the 'weak pre-linker' to abort on duplicate
symbols. One way to work-around this is to use the 'wl.exe' linker
directly, after conversion to OMF, which treats them as warnings.

The solution in this fix hides the symbols by reducing their visibility
to module-scope. It has not yet been determined if this fix is adequate.

File:

• branches/swt/include/win/initguid.h (modified) (2 diffs)

branches/swt/include/win/initguid.h

@@ -2 +2 @@
 
 /*
- * defines a minimum set of macros create GUID's to keep the size 
+ * defines a minimum set of macros create GUID's to keep the size
  * small
  *
@@ -20 +20 @@
 
 #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        const GUID name = \
+        static const GUID name = \
         { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
 
-#endif 
+#endif