diff options
author | bapt <bapt@FreeBSD.org> | 2014-09-09 16:35:40 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2014-09-09 16:35:40 +0800 |
commit | 4f7eec3c58d449d5fe06178c746a97ecdf19bc02 (patch) | |
tree | 9c51e937afe3bdc6658d12be4fe9c31efb7491ed /www/firefox/files | |
parent | a8c39a57dbff629fbf195b60484df84bfb8db190 (diff) | |
download | freebsd-ports-graphics-4f7eec3c58d449d5fe06178c746a97ecdf19bc02.tar.gz freebsd-ports-graphics-4f7eec3c58d449d5fe06178c746a97ecdf19bc02.tar.zst freebsd-ports-graphics-4f7eec3c58d449d5fe06178c746a97ecdf19bc02.zip |
Really update to firefox 32.0 release
Diffstat (limited to 'www/firefox/files')
-rw-r--r-- | www/firefox/files/patch-bug779713 | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/www/firefox/files/patch-bug779713 b/www/firefox/files/patch-bug779713 deleted file mode 100644 index 37e0bc2fb5c..00000000000 --- a/www/firefox/files/patch-bug779713 +++ /dev/null @@ -1,77 +0,0 @@ -diff --git mfbt/Alignment.h mfbt/Alignment.h -index e0843ca..353ec36 100644 ---- mfbt/Alignment.h -+++ mfbt/Alignment.h -@@ -9,11 +9,20 @@ - #ifndef mozilla_Alignment_h - #define mozilla_Alignment_h - -+#include "mozilla/Attributes.h" -+ - #include <stddef.h> - #include <stdint.h> - - namespace mozilla { - -+#if defined(MOZ_HAVE_CXX11_ALIGNAS) -+#define MOZ_ALIGNOF(T) alignof(T) -+#elif defined(__GNUC__) -+#define MOZ_ALIGNOF(T) __alignof__(T) -+#elif defined(_MSC_VER) -+#define MOZ_ALIGNOF(T) __alignof(T) -+#else - /* - * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many - * bytes of alignment a given type needs. -@@ -32,6 +41,7 @@ public: - }; - - #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment -+#endif - - /* - * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types. -@@ -43,7 +53,10 @@ public: - * will declare a two-character array |arr| aligned to 8 bytes. - */ - --#if defined(__GNUC__) -+#if defined(MOZ_HAVE_CXX11_ALIGNAS) -+# define MOZ_ALIGNED_DECL(_type, _align) \ -+ alignas(_align) _type -+#elif defined(__GNUC__) - # define MOZ_ALIGNED_DECL(_type, _align) \ - _type __attribute__((aligned(_align))) - #elif defined(_MSC_VER) -diff --git mfbt/Attributes.h mfbt/Attributes.h -index d317766..ddb13da 100644 ---- mfbt/Attributes.h -+++ mfbt/Attributes.h -@@ -51,6 +51,7 @@ - * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug - */ - # if _MSC_VER >= 1800 -+# define MOZ_HAVE_CXX11_ALIGNAS - # define MOZ_HAVE_CXX11_DELETE - # endif - # if _MSC_VER >= 1700 -@@ -74,6 +75,9 @@ - # ifndef __has_extension - # define __has_extension __has_feature /* compatibility, for older versions of clang */ - # endif -+# if __has_extension(cxx_alignas) -+# define MOZ_HAVE_CXX11_ALIGNAS -+# endif - # if __has_extension(cxx_constexpr) - # define MOZ_HAVE_CXX11_CONSTEXPR - # endif -@@ -95,6 +99,9 @@ - # endif - #elif defined(__GNUC__) - # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L -+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) -+# define MOZ_HAVE_CXX11_ALIGNAS -+# endif - # if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0) - # define MOZ_HAVE_CXX11_OVERRIDE - # define MOZ_HAVE_CXX11_FINAL final |