nedmalloc: allow compiling with MSys2's compiler
With MSys2's GCC, `ReadWriteBarrier` is already defined, and FORCEINLINE unfortunately gets defined incorrectly. Let's work around both problems, using the MSys2-specific __MINGW64_VERSION_MAJOR constant to guard the FORCEINLINE definition so as not to affect other platforms. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 14, 2016 at 17:51 UTC
9e2af084d4326ea2b1192074fb1d1ccefe0016a3
1 file changed
+4
compat/nedmalloc/malloc.c.h
+4
@@ -720,6 +720,9 @@ struct mallinfo {
720
inlining are defined as macros, so these aren't used for them.
721
*/
722
723
+#ifdef __MINGW64_VERSION_MAJOR
724
+#undef FORCEINLINE
725
+#endif
726
#ifndef FORCEINLINE
727
#if defined(__GNUC__)
728
#define FORCEINLINE __inline __attribute__ ((always_inline))
@@ -1382,6 +1385,7 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
1385
1386
/*** Atomic operations ***/
1387
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
1388
+ #undef _ReadWriteBarrier
1389
#define _ReadWriteBarrier() __sync_synchronize()
1390
#else
1391
static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value)