Kaydet (Commit) 5fd1a348 authored tarafından Luboš Luňák's avatar Luboš Luňák

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 437fe5a4.
üst 1cf7ab61
......@@ -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)
......
--- 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment