global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-05 15:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

mingw: allow compiling with MSys2's compiler

Browse Source 
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 them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2015-04-03 19:58:28 +01:00
parent 72ccf024b1
commit eeb4e702b0
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compat/nedmalloc/malloc.c.h
View File

@@ -720,6 +720,9 @@ struct mallinfo {
inlining are defined as macros, so these aren't used for them.
*/
#ifdef __MINGW64_VERSION_MAJOR
#undef FORCEINLINE
#endif
#ifndef FORCEINLINE
#if defined(__GNUC__)
#define FORCEINLINE __inline __attribute__ ((always_inline))
@@ -1382,6 +1385,9 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
/*** Atomic operations ***/
#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
#ifdef __MINGW64_VERSION_MAJOR
#undef _ReadWriteBarrier
#endif
#define _ReadWriteBarrier() __sync_synchronize()
#else
static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value)