diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-02-08 20:36:20 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-02-08 20:36:20 +0000 |
| commit | 5c1d1d37fbc4f0ebe42c83615beec9a8bf494d95 (patch) | |
| tree | fb89e503c2521481dcd83c93570c1a9de7d8158f | |
| parent | aa99e588767ef86520d78bbc4607117ab4df1c11 (diff) | |
| parent | 9f2085b5e9cacef40e942b72fc9b4e729defe2c1 (diff) | |
| download | uxp-5c1d1d37fbc4f0ebe42c83615beec9a8bf494d95.tar.gz | |
Merge pull request 'Support for latest stable FreeBSD (12.2)' (#1736) from OlCe1/UXP:FreeBSD-support-update into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1736
| -rw-r--r-- | config/gcc-stl-wrapper.template.h | 8 | ||||
| -rw-r--r-- | gfx/harfbuzz/src/hb-blob.cc | 2 | ||||
| -rw-r--r-- | memory/mozjemalloc/jemalloc.c | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h index 9b4a61d246..e7b01482c2 100644 --- a/config/gcc-stl-wrapper.template.h +++ b/config/gcc-stl-wrapper.template.h @@ -32,6 +32,14 @@ # define moz_dont_include_mozalloc_for_cstdlib #endif +#ifndef moz_dont_include_mozalloc_for_type_traits +# define moz_dont_include_mozalloc_for_type_traits +#endif + +#ifndef moz_dont_include_mozalloc_for_limits +# define moz_dont_include_mozalloc_for_limits +#endif + // Include mozalloc after the STL header and all other headers it includes // have been preprocessed. #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ diff --git a/gfx/harfbuzz/src/hb-blob.cc b/gfx/harfbuzz/src/hb-blob.cc index fb48f03cab..6577781c19 100644 --- a/gfx/harfbuzz/src/hb-blob.cc +++ b/gfx/harfbuzz/src/hb-blob.cc @@ -24,10 +24,12 @@ * Red Hat Author(s): Behdad Esfahbod */ +#ifndef __FreeBSD__ /* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */ #ifndef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 199309L #endif +#endif #include "hb-private.hh" diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c index bbd68365b5..5b8a6c3264 100644 --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/jemalloc.c @@ -5251,7 +5251,7 @@ malloc_init_hard(void) * Another thread initialized the allocator before this one * acquired init_lock. */ -#ifndef MOZ_MEMORY_WINDOWS +#if !(defined(MOZ_MEMORY_WINDOWS) || defined(__FreeBSD__)) malloc_mutex_unlock(&init_lock); #endif return (false); @@ -6755,7 +6755,8 @@ jemalloc_darwin_init(void) #define is_malloc_(a) malloc_is_ ## a #define is_malloc(a) is_malloc_(a) -#if !defined(MOZ_MEMORY_DARWIN) && (is_malloc(malloc_impl) == 1) +#if !(defined(MOZ_MEMORY_DARWIN) || defined(MOZ_MEMORY_BSD)) && \ + (is_malloc(malloc_impl) == 1) # if defined(__GLIBC__) && !defined(__UCLIBC__) /* * glibc provides the RTLD_DEEPBIND flag for dlopen which can make it possible |