include/SDL_atomic.h
changeset 5005 7f0265279b68
parent 5004 0c72ae7b7cb2
child 5006 8e8876e4aec6
--- 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 <windows.h>
+#endif
 
 #define SDL_AtomicSet(a, v)     InterlockedExchange(&(a)->value, v)
 #define SDL_AtomicGet(a)        ((a)->value)