Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed bug #1097

There are problems with including intrin.h in C linkage in C++ compilation,
and further conflicts between intrin.h and winnt.h on Visual Studio 2005.
  • Loading branch information
slouken committed Jan 22, 2011
1 parent 4928b13 commit 48df290cc805b1ec0dd9c23881c12e55e6fea7d8
Showing with 12 additions and 2 deletions.
  1. +8 −2 include/SDL_atomic.h
  2. +4 −0 src/atomic/SDL_spinlock.c
@@ -56,6 +56,13 @@

#include "begin_code.h"

/* Need to do this here because intrin.h has C++ code in it */
/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
#if defined(_MSC_VER) && (_MSC_VER >= 1500)
#include <intrin.h>
#define HAVE_MSC_ATOMICS
#endif

/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
/* *INDENT-OFF* */
@@ -112,8 +119,7 @@ extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);
*/
#ifndef SDL_DISABLE_ATOMIC_INLINE

#if defined(_MSC_VER)
#include <intrin.h>
#if defined(HAVE_MSC_ATOMICS)

#define SDL_AtomicSet(a, v) _InterlockedExchange((long*)&(a)->value, (v))
#define SDL_AtomicGet(a) ((a)->value)
@@ -24,6 +24,10 @@
#include "SDL_atomic.h"
#include "SDL_timer.h"

/* Don't do the check for Visual Studio 2005, it's safe here */
#if defined(_MSC_VER)
#include <intrin.h>
#endif

/* This function is where all the magic happens... */
SDL_bool

0 comments on commit 48df290

Please sign in to comment.