Fixed clang -Weverything warnings

libsdl-org · Nov 22, 2012 · b95ce12 · b95ce12
1 parent c4df183
commit b95ce12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/include/SDL_pixels.h b/include/SDL_pixels.h
@@ -114,9 +114,10 @@ enum
 #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D)
 
 #define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \
-    ((1 << 31) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \
+    ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \
      ((bits) << 8) | ((bytes) << 0))
 
+#define SDL_PIXELFLAG(X)	(((X) >> 28) & 0x0F)
 #define SDL_PIXELTYPE(X)	(((X) >> 24) & 0x0F)
 #define SDL_PIXELORDER(X)	(((X) >> 20) & 0x0F)
 #define SDL_PIXELLAYOUT(X)	(((X) >> 16) & 0x0F)
@@ -140,8 +141,9 @@ enum
       (SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \
       (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA)))
 
+/* The flag is set to 1 because 0x1? is not in the printable ASCII range */
 #define SDL_ISPIXELFORMAT_FOURCC(format)    \
-    ((format) && !((format) & 0x80000000))
+    ((format) && (SDL_PIXELFLAG(format) != 1))
 
 /* Note: If you modify this list, update SDL_GetPixelFormatName() */
 enum

diff --git a/include/SDL_system.h b/include/SDL_system.h
@@ -30,7 +30,7 @@
 
 #include "SDL_stdinc.h"
 
-#if __IPHONEOS__
+#if defined(__IPHONEOS__) && __IPHONEOS__
 #include "SDL_video.h"
 #include "SDL_keyboard.h"
 #endif
@@ -44,7 +44,7 @@ extern "C" {
 #endif
 
 /* Platform specific functions for iOS */
-#if __IPHONEOS__
+#if defined(__IPHONEOS__) && __IPHONEOS__
 
 extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
 extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
@@ -53,7 +53,7 @@ extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
 
 
 /* Platform specific functions for Android */
-#if __ANDROID__
+#if defined(__ANDROID__) && __ANDROID__
 
 /* Get the JNI environment for the current thread
    This returns JNIEnv*, but the prototype is void* so we don't need jni.h