Skip to content

Commit 9e2af08

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7b40ae8 commit 9e2af08

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

compat/nedmalloc/malloc.c.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,9 @@ struct mallinfo {
720720
inlining are defined as macros, so these aren't used for them.
721721
*/
722722

723+
#ifdef __MINGW64_VERSION_MAJOR
724+
#undef FORCEINLINE
725+
#endif
723726
#ifndef FORCEINLINE
724727
#if defined(__GNUC__)
725728
#define FORCEINLINE __inline __attribute__ ((always_inline))
@@ -1382,6 +1385,7 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
13821385

13831386
/*** Atomic operations ***/
13841387
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
1388+
#undef _ReadWriteBarrier
13851389
#define _ReadWriteBarrier() __sync_synchronize()
13861390
#else
13871391
static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value)

0 commit comments

Comments
 (0)