From 8ee7017770e7eaf783cb398d26abfcdcace1bd45 Mon Sep 17 00:00:00 2001 From: "J?rgen P. Tjern?" Date: Mon, 25 Feb 2013 16:52:48 -0800 Subject: [PATCH] sdl2 - fix atomic header to compile happily under msvc 6.0 --- include/SDL_atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/SDL_atomic.h b/include/SDL_atomic.h index 2f1734963..bba530102 100644 --- a/include/SDL_atomic.h +++ b/include/SDL_atomic.h @@ -126,7 +126,7 @@ extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock); * The compiler barrier prevents the compiler from reordering * reads and writes to globally visible variables across the call. */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER > 1200) void _ReadWriteBarrier(void); #pragma intrinsic(_ReadWriteBarrier) #define SDL_CompilerBarrier() _ReadWriteBarrier() @@ -134,7 +134,7 @@ void _ReadWriteBarrier(void); #define SDL_CompilerBarrier() __asm__ __volatile__ ("" : : : "memory") #else #define SDL_CompilerBarrier() \ -({ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); }) +{ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); } #endif /* Platform specific optimized versions of the atomic functions,