Changeset 2437 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Apr 30, 2007 3:25:20 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20846

Message:

partly fixed my last commit for gcc-3

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• base/nscore.h (modified) (2 diffs)
• reflect/xptcall/public/xptcall.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/base/nscore.h

@@ -102 +102 @@
 #ifdef HAVE_VISIBILITY_ATTRIBUTE
 #define NS_VISIBILITY_HIDDEN   __attribute__ ((visibility ("hidden")))
-#define NS_VISIBILITY_DEFAULT  __attribute__ ((visibility ("default")))
+# if __GNUC__ >= 4
+#  define NS_VISIBILITY_DEFAULT  __attribute__ ((visibility ("default")))
+# else
+#  define NS_VISIBILITY_DEFAULT
+# endif
 
 #define NS_HIDDEN_(type)   NS_VISIBILITY_HIDDEN type
@@ -179 +183 @@
 #else
 
-#define NS_IMPORT
-#define NS_IMPORT_(type) type
-#define NS_EXPORT __attribute__((visibility("default")))
-#define NS_EXPORT_(type) __attribute__((visibility("default"))) type
-#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
-#define NS_IMETHODIMP_(type) type
-#define NS_METHOD_(type) type
-#define NS_CALLBACK_(_type, _name) _type (* _name)
-#define NS_STDCALL
+# if __GNUC__ >= 4
+#  define NS_IMPORT
+#  define NS_IMPORT_(type) type
+#  define NS_EXPORT __attribute__((visibility("default")))
+#  define NS_EXPORT_(type) __attribute__((visibility("default"))) type
+#  define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
+#  define NS_IMETHODIMP_(type) type
+#  define NS_METHOD_(type) type
+#  define NS_CALLBACK_(_type, _name) _type (* _name)
+#  define NS_STDCALL
+# else
+#  define NS_IMPORT
+#  define NS_IMPORT_(type) type
+#  define NS_EXPORT
+#  define NS_EXPORT_(type) type
+#  define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
+#  define NS_IMETHODIMP_(type) type
+#  define NS_METHOD_(type) type
+#  define NS_CALLBACK_(_type, _name) _type (* _name)
+#  define NS_STDCALL
+# endif
 #endif
 

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/xptcall.h

@@ -61 +61 @@
 #    define XPTC_EXPORT           __declspec(dllexport)
 #else
+#  if __GNUC__ >= 4
 #    define XPTC_EXPORT           __attribute__((visibility("default")))
+#  else
+#    define XPTC_EXPORT 
+#  endif
 #endif
 #else