Changeset 2437 in vbox

Timestamp:

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

Author:

vboxsync

Message:

partly fixed my last commit for gcc-3

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (1 diff)
• src/libs/xpcom18a4/nsprpub/pr/include/prtypes.h (modified) (1 diff)
• src/libs/xpcom18a4/xpcom/base/nscore.h (modified) (2 diffs)
• src/libs/xpcom18a4/xpcom/reflect/xptcall/public/xptcall.h (modified) (1 diff)

trunk/include/iprt/cdefs.h

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

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prtypes.h

@@ -179 +179 @@
 #else /* Unix */
 
-#define PR_EXPORT(__type) __attribute__((visibility("default"))) extern __type
-#define PR_EXPORT_DATA(__type) __attribute__((visibility("default"))) extern __type
-#define PR_IMPORT(__type) extern __type
-#define PR_IMPORT_DATA(__type) extern __type
-
-#define PR_EXTERN(__type) __attribute__((visibility("default"))) extern __type
-#define PR_IMPLEMENT(__type) __attribute__((visibility("default"))) __type
-#define PR_EXTERN_DATA(__type) __attribute__((visibility("default"))) extern __type
-#define PR_IMPLEMENT_DATA(__type) __attribute__((visibility("default"))) __type
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
+# if __GNUC__ >= 4
+#  define PR_EXPORT(__type) __attribute__((visibility("default"))) extern __type
+#  define PR_EXPORT_DATA(__type) __attribute__((visibility("default"))) extern __type
+#  define PR_IMPORT(__type) extern __type
+#  define PR_IMPORT_DATA(__type) extern __type
+#  define PR_EXTERN(__type) __attribute__((visibility("default"))) extern __type
+#  define PR_IMPLEMENT(__type) __attribute__((visibility("default"))) __type
+#  define PR_EXTERN_DATA(__type) __attribute__((visibility("default"))) extern __type
+#  define PR_IMPLEMENT_DATA(__type) __attribute__((visibility("default"))) __type
+#  define PR_CALLBACK
+#  define PR_CALLBACK_DECL
+#  define PR_STATIC_CALLBACK(__x) static __x
+# else
+#  define PR_EXPORT(__type) extern __type
+#  define PR_EXPORT_DATA(__type) extern __type
+#  define PR_IMPORT(__type) extern __type
+#  define PR_IMPORT_DATA(__type) extern __type
+#  define PR_EXTERN(__type) extern __type
+#  define PR_IMPLEMENT(__type) __type
+#  define PR_EXTERN_DATA(__type) extern __type
+#  define PR_IMPLEMENT_DATA(__type) __type
+#  define PR_CALLBACK
+#  define PR_CALLBACK_DECL
+#  define PR_STATIC_CALLBACK(__x) static __x
+# endif
 #endif
 

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