# HG changeset patch # User Sam Lantinga # Date 1295220669 28800 # Node ID 7f0265279b68ee9d13f086003ab78d2657a7c258 # Parent 0c72ae7b7cb2e6dd09bfa47839959dbea525cd5f Don't hose code that isn't expecting a windows include diff -r 0c72ae7b7cb2 -r 7f0265279b68 include/SDL_atomic.h --- a/include/SDL_atomic.h Sun Jan 16 15:16:39 2011 -0800 +++ b/include/SDL_atomic.h Sun Jan 16 15:31:09 2011 -0800 @@ -108,9 +108,13 @@ /*@}*//*SDL AtomicLock*/ /* Platform specific optimized versions of the atomic functions */ -#if defined(__WIN32__) +#if defined(__WIN32__) && defined(_INC_WINDOWS) +/* Don't include windows.h, since it may hose code that isn't expecting it, + but if someone has already included it, this is fair game... */ +#if 0 #define WIN32_LEAN_AND_MEAN #include +#endif #define SDL_AtomicSet(a, v) InterlockedExchange(&(a)->value, v) #define SDL_AtomicGet(a) ((a)->value)