summaryrefslogtreecommitdiff
path: root/mail/thunderbird/files/patch-bug779713
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-04-12 19:18:55 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-04-12 19:18:55 +0000
commit79fd5d2214d2f30a869a8c5a973f53261da13290 (patch)
treef664ae9c72bc07e9347d596062d32e310cb5ede2 /mail/thunderbird/files/patch-bug779713
parentRemove accidentally leftover ${PORTSDIR} vars in *_DEPENDS (diff)
mail/thunderbird: update to 45.0 (rc1)
Changes: https://www.mozilla.org/thunderbird/45.0/releasenotes/ Security: 92d44f83-a7bf-41cf-91ee-3d1b8ecf579f MFH: 2016Q2
Notes
Notes: svn path=/head/; revision=413157
Diffstat (limited to 'mail/thunderbird/files/patch-bug779713')
-rw-r--r--mail/thunderbird/files/patch-bug77971377
1 files changed, 0 insertions, 77 deletions
diff --git a/mail/thunderbird/files/patch-bug779713 b/mail/thunderbird/files/patch-bug779713
deleted file mode 100644
index aa2882a9a41c..000000000000
--- a/mail/thunderbird/files/patch-bug779713
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git mfbt/Alignment.h mfbt/Alignment.h
-index e0843ca..353ec36 100644
---- mozilla/mfbt/Alignment.h
-+++ mozilla/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
---- mozilla/mfbt/Attributes.h
-+++ mozilla/mfbt/Attributes.h
-@@ -50,6 +50,7 @@
- * don't indicate support for them here, due to
- * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
- */
-+# define MOZ_HAVE_CXX11_ALIGNAS
- # define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
- # define MOZ_HAVE_NORETURN __declspec(noreturn)
- # ifdef __clang__
-@@ -70,6 +71,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
-@@ -84,6 +88,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
- # define MOZ_HAVE_CXX11_CONSTEXPR
- # define MOZ_HAVE_EXPLICIT_CONVERSION
- # endif