Changeset 40426 in vbox for trunk/src/libs/xpcom18a4/xpcom/base/nscore.h

Timestamp:

Mar 12, 2012 1:27:50 PM (13 years ago)

Author:

vboxsync

Message:

libs/xpcom: gcc-4.7 fix: Remove NS_DEFCALL. regparm(0) is default on x86 and there is no sense to mark a normal function with that attribute. This attribute was removed at upstream some months ago.

File:

• trunk/src/libs/xpcom18a4/xpcom/base/nscore.h (modified) (4 diffs)

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

@@ -147 +147 @@
 #endif
 
-/*
- * NS_DEFCALL undoes the effect of a global regparm/stdcall setting
- * so that xptcall works correctly.
- */
-#if defined(__i386__) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_OS2)
-#define NS_DEFCALL __attribute__ ((regparm (0), cdecl))
-#else
-#define NS_DEFCALL
-#endif
-
 /* XXX: nike, maybe fix */
 #define NS_EXPORT_STATIC_MEMBER_(type) type
@@ -191 +181 @@
 #define NS_EXPORT __declspec(dllexport)
 #define NS_EXPORT_(type) type __declspec(dllexport) __stdcall
-#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
+#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type
 #define NS_IMETHODIMP_(type) type
 #define NS_METHOD_(type) type
@@ -204 +194 @@
 #  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_IMETHOD_(type) virtual IMETHOD_VISIBILITY type
 #  define NS_IMETHODIMP_(type) type
 #  define NS_METHOD_(type) type
@@ -214 +204 @@
 #  define NS_EXPORT
 #  define NS_EXPORT_(type) type
-#  define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
+#  define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type
 #  define NS_IMETHODIMP_(type) type
 #  define NS_METHOD_(type) type