We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Fix for Visual Studio 2005

SDL_VS2005.fix (text/plain), 1.47 KB, created by Sam Lantinga on 2011-01-22 12:03:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Lantinga

Created: 2011-01-22 12:03:03 UTC

Size: 1.47 KB

patch

obsolete

># HG changeset patch
># User Sam Lantinga <slouken@libsdl.org>
># Date 1295682411 28800
># Node ID c7de121221e98679daf801b8daaa1999ed897c34
># Parent  55ff76cdbbb8a4271ea05f2af6a35b7a82e6af6b
>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.
>
>diff --git a/include/SDL_atomic.h b/include/SDL_atomic.h
>--- a/include/SDL_atomic.h
>+++ b/include/SDL_atomic.h
>@@ -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 @@
>  */
> #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)
>diff --git a/src/atomic/SDL_spinlock.c b/src/atomic/SDL_spinlock.c
>--- a/src/atomic/SDL_spinlock.c
>+++ b/src/atomic/SDL_spinlock.c
>@@ -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

Actions: View | Diff

Attachments on bug 1097: 556

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.