diff options
author | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2025-03-27 20:06:37 +0100 |
---|---|---|
committer | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2025-03-27 20:06:37 +0100 |
commit | a9097e0cd9ee6794deea0015289aae24f8176916 (patch) | |
tree | e1eb5b5307c223641a50a03a2da38143f86d48d7 /mail/thunderbird-esr/files/patch-js_public_Utility.h | |
parent | www/firefox-esr: update to 128.9.0 (rc2) (diff) |
mail/thunderbird-esr: copy thunderbird 128.9.0
in preparation for importing Thunderbird 137.0
Release Notes (soon):
https://www.thunderbird.net/en-US/thunderbird/128.9.0esr/releasenotes/
Diffstat (limited to 'mail/thunderbird-esr/files/patch-js_public_Utility.h')
-rw-r--r-- | mail/thunderbird-esr/files/patch-js_public_Utility.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/mail/thunderbird-esr/files/patch-js_public_Utility.h b/mail/thunderbird-esr/files/patch-js_public_Utility.h new file mode 100644 index 000000000000..4c2e16bc932c --- /dev/null +++ b/mail/thunderbird-esr/files/patch-js_public_Utility.h @@ -0,0 +1,35 @@ +commit 57b30241311091b5a6a5a0bb1c19a8e073860fc3 +Author: Christoph Moench-Tegeder <cmt@burggraben.net> + + do not assert on alignment when not having the bits + + the underlying issue seemed to be win-only anyways? + +diff --git js/public/Utility.h js/public/Utility.h +index 0d745e9df785..f0ca7ea37162 100644 +--- js/public/Utility.h ++++ js/public/Utility.h +@@ -480,6 +480,7 @@ static inline void js_free(void* p) { + * Note: Do not add a ; at the end of a use of JS_DECLARE_NEW_METHODS, + * or the build will break. + */ ++#if !defined(__i386__) + #define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ + template <class T, typename... Args> \ + QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ +@@ -490,6 +491,15 @@ static inline void js_free(void* p) { + return MOZ_LIKELY(memory) ? new (memory) T(std::forward<Args>(args)...) \ + : nullptr; \ + } ++#else ++#define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \ ++ template <class T, typename... Args> \ ++ QUALIFIERS T* MOZ_HEAP_ALLOCATOR NEWNAME(Args&&... args) { \ ++ void* memory = ALLOCATOR(sizeof(T)); \ ++ return MOZ_LIKELY(memory) ? new (memory) T(std::forward<Args>(args)...) \ ++ : nullptr; \ ++ } ++#endif + + /* + * Given a class which should provide a 'new' method that takes an arena as |