diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-02-24 13:25:32 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-02-24 14:06:19 +0100 |
| commit | 5fd1a34816b81fee6f54ad93d0047daaeaea51c1 (patch) | |
| tree | 466dd8c1ac0c166897cc95a365658bbb44339f88 | |
| parent | 1cf7ab61a71d4b7295942ff5c855896e60c15081 (diff) | |
Revert "Work around g++ -std=c++0x rejecting "typeof" keyword"
We now default to -std=gnu++0x, so this shouldn't be necessary.
This reverts commit 437fe5a444411f68d1848c49121394f16f09611b.
| -rw-r--r-- | moz/makefile.mk | 1 | ||||
| -rw-r--r-- | moz/patches/seamonkey-1.1.14.source-typeof.patch | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 4146f418a367..7f926e5d84c7 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -88,7 +88,6 @@ PATCH_FILES = \ patches/nss-linux3.patch \ patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \ patches/clang_missing_this_pointers.patch \ - patches/seamonkey-1.1.14.source-typeof.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/seamonkey-1.1.14.source-typeof.patch b/moz/patches/seamonkey-1.1.14.source-typeof.patch deleted file mode 100644 index 632e155f2407..000000000000 --- a/moz/patches/seamonkey-1.1.14.source-typeof.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- misc/mozilla/xpcom/base/nscore.h 2006-08-24 23:46:32.000000000 +0200 -+++ misc/build/mozilla/xpcom/base/nscore.h 2012-02-21 09:22:51.136057997 +0100 -@@ -211,9 +211,14 @@ - * when http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11893 is fixed. - */ - -+// At least "g++ (GCC) 4.6.2 20111027 (Red Hat 4.6.2-1)" with -std=c++0x no -+// longer recognizes "typeof" as a (GCC extension) keyword (an alternative fix -+// might be to check the GCC version, as the bug mentioned above is reportedly -+// fixed in GCC 4.4.3, see -+// <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=9381#c15>): - #ifdef __GNUC__ - #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ -- typeof(&class::func) name -+ __typeof__(&class::func) name - #else - #define NS_STDCALL_FUNCPROTO(ret, name, class, func, args) \ - ret (NS_STDCALL class::*name) args |