From ee718f18d97b7a907823aac03d1a004a4aa0e8ba Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 29 Dec 2018 00:45:35 +0100 Subject: [PATCH] Cygwin headers provide their own FORCEINLINE macro. --- client/tracy_rpmalloc.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/tracy_rpmalloc.cpp b/client/tracy_rpmalloc.cpp index 73ae7cf7..9e8d66c2 100644 --- a/client/tracy_rpmalloc.cpp +++ b/client/tracy_rpmalloc.cpp @@ -101,6 +101,9 @@ # include # endif # define ALIGNED_STRUCT(name, alignment) struct __attribute__((__aligned__(alignment))) name +# ifdef FORCEINLINE +# undef FORCEINLINE +# endif # define FORCEINLINE inline __attribute__((__always_inline__)) # ifdef __arm__ # define atomic_thread_fence_acquire() __asm volatile("dmb ish" ::: "memory")