summaryrefslogtreecommitdiffstats
path: root/toolkit/components
diff options
context:
space:
mode:
authorJMadgwick <james.madgwick@outlook.com>2020-03-05 21:03:44 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 13:18:48 +0200
commit64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53 (patch)
treebb1ec37d987918be07f551b956ba3887c1c7d523 /toolkit/components
parent514ff21cbab5c638d9c347ed261a14e8bd5295e6 (diff)
downloadUXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar
UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar.gz
UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar.lz
UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar.xz
UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.zip
Issue #1471 - Fix building on sparc64 Linux
Correct various pre-processor defines for sparc64 and in mozjemalloc use the JS arm64 allocator on Linux/sparc64. This corrects build problems opn Linux sparc64 and is in line with bugzilla bug #1275204.
Diffstat (limited to 'toolkit/components')
-rw-r--r--toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h b/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h
index 7956d076d..b05f2f853 100644
--- a/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h
+++ b/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h
@@ -67,7 +67,7 @@
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
#elif defined(sparc)
#define GOOGLE_PROTOBUF_ARCH_SPARC 1
-#ifdef SOLARIS_64BIT_ENABLED
+#ifdef __arch64__
#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
#else
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1