diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:13:11 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:19:04 -0500 |
| commit | 3daf711085889bad1bd68651bc4e8790412ae105 (patch) | |
| tree | f5b0e4c1befb320cdf158e1839ac5e273373087f /memory/mozalloc | |
| parent | 7fe702603066e7f122d5dd66a3a1892ac7e06215 (diff) | |
| download | uxp-3daf711085889bad1bd68651bc4e8790412ae105.tar.gz | |
Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”
This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.
Diffstat (limited to 'memory/mozalloc')
| -rw-r--r-- | memory/mozalloc/mozalloc.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h index 50dc53e5ce..f42c7b04a0 100644 --- a/memory/mozalloc/mozalloc.h +++ b/memory/mozalloc/mozalloc.h @@ -1,4 +1,6 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + * vim: sw=4 ts=4 et : + */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -150,9 +152,13 @@ MFBT_API void* moz_xvalloc(size_t size) */ /* NB: This is defined just to silence vacuous warnings about symbol - * visibility on gcc. These symbols are force-inline and not exported. - */ -#define MOZALLOC_EXPORT_NEW + * visibility on OS X/gcc. These symbols are force-inline and not + * exported. */ +#if defined(XP_MACOSX) +# define MOZALLOC_EXPORT_NEW MFBT_API +#else +# define MOZALLOC_EXPORT_NEW +#endif #if defined(_MSC_VER) /* |