mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 05:40:07 +02:00
26 lines
785 B
Plaintext
26 lines
785 B
Plaintext
From d2b4be799813318da7da076de1fe74461e08dad1 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Wed, 17 May 2017 22:52:04 +0200
|
|
Subject: use Atomic32 on 32-bit.
|
|
|
|
|
|
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h
|
|
index 75aee30..13e23f6 100644
|
|
--- a/src/google/protobuf/stubs/atomicops.h
|
|
+++ b/src/google/protobuf/stubs/atomicops.h
|
|
@@ -89,7 +89,11 @@ typedef intptr_t Atomic64;
|
|
|
|
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
|
|
// Atomic64 routines below, depending on your architecture.
|
|
+#if defined(__HAIKU__) && !defined(GOOGLE_PROTOBUF_ARCH_64_BIT)
|
|
+typedef Atomic32 AtomicWord;
|
|
+#else
|
|
typedef intptr_t AtomicWord;
|
|
+#endif
|
|
|
|
// Atomically execute:
|
|
// result = *ptr;
|
|
--
|
|
2.12.2
|
|
|