diff options
Diffstat (limited to 'unmaintained/icecat/gcc6-fix-compilation-for-IceCat.patch')
| -rw-r--r-- | unmaintained/icecat/gcc6-fix-compilation-for-IceCat.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/unmaintained/icecat/gcc6-fix-compilation-for-IceCat.patch b/unmaintained/icecat/gcc6-fix-compilation-for-IceCat.patch deleted file mode 100644 index 2c291567c..000000000 --- a/unmaintained/icecat/gcc6-fix-compilation-for-IceCat.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/config/gcc-stl-wrapper.template.h 2016-05-10 22:26:46.000000000 +0200 -+++ b/config/gcc-stl-wrapper.template.h 2016-05-23 23:48:21.137431360 +0200 -@@ -22,6 +22,11 @@ - #define NOMINMAX 1 - #endif - -+// Don't include mozalloc for cstdlib. See bug 1245076. -+#ifndef moz_dont_include_mozalloc_for_cstdlib -+# define moz_dont_include_mozalloc_for_cstdlib -+#endif -+#ifndef moz_dont_include_mozalloc_for_${HEADER} - // mozalloc.h wants <new>; break the cycle by always explicitly - // including <new> here. NB: this is a tad sneaky. Sez the gcc docs: - // -@@ -30,15 +35,17 @@ - // same name as the current file. It simply looks for the file - // named, starting with the directory in the search path after the - // one where the current file was found. --#include_next <new> -+# include_next <new> - - // See if we're in code that can use mozalloc. NB: this duplicates - // code in nscore.h because nscore.h pulls in prtypes.h, and chromium - // can't build with that being included before base/basictypes.h. --#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) --# include "mozilla/mozalloc.h" --#else --# error "STL code can only be used with infallible ::operator new()" -+# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -+# include "mozilla/mozalloc.h" -+# else -+# error "STL code can only be used with infallible ::operator new()" -+# endif -+ - #endif - - #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) |