206b0e0be9
Probably resolves lots of security issues that are not public. Release notes: https://www.mozilla.org/en-US/firefox/47.0/releasenotes/
72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
diff -r 34544e6dfc19 -r 55212130f19d config/gcc-stl-wrapper.template.h
|
|
--- a/config/gcc-stl-wrapper.template.h Fri Mar 11 11:45:09 2016 +0800
|
|
+++ b/config/gcc-stl-wrapper.template.h Thu Mar 10 16:54:05 2016 +0900
|
|
@@ -12,33 +12,40 @@
|
|
// compiling ObjC.
|
|
#if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
|
|
# error "STL code can only be used with -fno-exceptions"
|
|
#endif
|
|
|
|
// Silence "warning: #include_next is a GCC extension"
|
|
#pragma GCC system_header
|
|
|
|
+// 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:
|
|
//
|
|
// `#include_next' does not distinguish between <file> and "file"
|
|
// inclusion, nor does it check that the file you specify has the
|
|
// 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)
|
|
// Enable checked iterators and other goodies
|
|
//
|
|
// FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
|
|
// Figure out how to resolve this with -fno-rtti. Maybe build with
|
|
// -frtti in DEBUG builds?
|
|
diff -r 34544e6dfc19 -r 55212130f19d gfx/graphite2/src/Collider.cpp
|
|
--- a/gfx/graphite2/src/Collider.cpp Fri Mar 11 11:45:09 2016 +0800
|
|
+++ b/gfx/graphite2/src/Collider.cpp Thu Mar 10 16:54:05 2016 +0900
|
|
@@ -21,17 +21,17 @@
|
|
|
|
Alternatively, the contents of this file may be used under the terms of the
|
|
Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public
|
|
License, as published by the Free Software Foundation, either version 2
|
|
of the License or (at your option) any later version.
|
|
*/
|
|
#include <algorithm>
|
|
#include <limits>
|
|
-#include <math.h>
|
|
+#include <cmath>
|
|
#include <string>
|
|
#include <functional>
|
|
#include "inc/Collider.h"
|
|
#include "inc/Segment.h"
|
|
#include "inc/Slot.h"
|
|
#include "inc/GlyphCache.h"
|
|
#include "inc/Sparse.h"
|
|
|