Don't hose code that isn't expecting a windows include

libsdl-org · Jan 16, 2011 · 41baa9c · 41baa9c
1 parent 4e72e7d
commit 41baa9c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/include/SDL_atomic.h b/include/SDL_atomic.h
@@ -108,9 +108,13 @@ extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);
 /*@}*//*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 <windows.h>
+#endif
 
 #define SDL_AtomicSet(a, v)     InterlockedExchange(&(a)->value, v)
 #define SDL_AtomicGet(a)        ((a)->value)