From 9461de186712b2835181361d037f0960e5653efd Mon Sep 17 00:00:00 2001
From: Nick Edwards <nick.edwards@sharkmob.com>
Date: Mon, 9 Aug 2021 18:33:39 +0100
Subject: [PATCH] Add spaces after uses of _Atomic() to prevent it from
 expanding as a prefix to the following identifier. e.g. _Atomic(uintptr_t)x =
 0; -> uintptr_tx = 0; static
 _Atomic(uintptr_t)mi_segment_map[MI_SEGMENT_MAP_WSIZE]; -> static
 uintptr_tmi_segment_map[MI_SEGMENT_MAP_WSIZE];

---
 include/mimalloc-atomic.h | 2 +-
 src/segment-cache.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mimalloc-atomic.h b/include/mimalloc-atomic.h
index dc48f0a2..a17e9663 100644
--- a/include/mimalloc-atomic.h
+++ b/include/mimalloc-atomic.h
@@ -173,7 +173,7 @@ static inline uintptr_t mi_atomic_exchange_explicit(_Atomic(uintptr_t)*p, uintpt
 }
 static inline void mi_atomic_thread_fence(mi_memory_order mo) {
   (void)(mo);
-  _Atomic(uintptr_t)x = 0;
+  _Atomic(uintptr_t) x = 0;
   mi_atomic_exchange_explicit(&x, 1, mo);
 }
 static inline uintptr_t mi_atomic_load_explicit(_Atomic(uintptr_t) const* p, mi_memory_order mo) {
diff --git a/src/segment-cache.c b/src/segment-cache.c
index 08517f4b..d33048b2 100644
--- a/src/segment-cache.c
+++ b/src/segment-cache.c
@@ -225,7 +225,7 @@ mi_decl_noinline bool _mi_segment_cache_push(void* start, size_t size, size_t me
 #define MI_SEGMENT_MAP_SIZE  (MI_SEGMENT_MAP_BITS / 8)
 #define MI_SEGMENT_MAP_WSIZE (MI_SEGMENT_MAP_SIZE / MI_INTPTR_SIZE)
 
-static _Atomic(uintptr_t)mi_segment_map[MI_SEGMENT_MAP_WSIZE];  // 2KiB per TB with 64MiB segments
+static _Atomic(uintptr_t) mi_segment_map[MI_SEGMENT_MAP_WSIZE];  // 2KiB per TB with 64MiB segments
 
 static size_t mi_segment_map_index_of(const mi_segment_t* segment, size_t* bitidx) {
   mi_assert_internal(_mi_ptr_segment(segment) == segment); // is it aligned on MI_SEGMENT_SIZE?