From 3344db40ffb2ef201973a0c7214072b8f7bfabc7 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Mon, 23 Jun 2014 11:06:50 -0700
Subject: [PATCH] Don't redefine standard macros, use SDL specific macros
 instead to avoid compiler warnings

---
 include/SDL_stdinc.h        | 20 ++++++++++++--------
 src/test/SDL_test_harness.c |  2 +-
 test/testgesture.c          | 10 +++++-----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
index c47ea4c3efbad..78d3402e72c8d 100644
--- a/include/SDL_stdinc.h
+++ b/include/SDL_stdinc.h
@@ -168,18 +168,22 @@ typedef uint64_t Uint64;
 /* Make sure we have macros for printing 64 bit values.
  * <stdint.h> should define these but this is not true all platforms.
  * (for example win32) */
-#ifndef PRIs64
-#ifdef __WIN32__
-#define PRIs64 "I64"
+#ifndef SDL_PRIs64
+#ifdef PRIs64
+#define SDL_PRIs64 PRIs64
+#elif defined(__WIN32__)
+#define SDL_PRIs64 "I64"
 #else
-#define PRIs64 "lld"
+#define SDL_PRIs64 "lld"
 #endif
 #endif
-#ifndef PRIu64
-#ifdef __WIN32__
-#define PRIu64 "I64u"
+#ifndef SDL_PRIu64
+#ifdef PRIu64
+#define SDL_PRIu64 PRIu64
+#elif defined(__WIN32__)
+#define SDL_PRIu64 "I64u"
 #else
-#define PRIu64 "llu"
+#define SDL_PRIu64 "llu"
 #endif
 #endif
 
diff --git a/src/test/SDL_test_harness.c b/src/test/SDL_test_harness.c
index b4ad59634d2cb..cfd8d2af62f52 100644
--- a/src/test/SDL_test_harness.c
+++ b/src/test/SDL_test_harness.c
@@ -564,7 +564,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
                             execKey = SDLTest_GenerateExecKey((char *)runSeed, testSuite->name, testCase->name, iterationCounter);
                         }
 
-                        SDLTest_Log("Test Iteration %i: execKey %" PRIu64, iterationCounter, execKey);
+                        SDLTest_Log("Test Iteration %i: execKey %" SDL_PRIu64, iterationCounter, execKey);
                         testResult = SDLTest_RunTest(testSuite, testCase, execKey);
 
                         if (testResult == TEST_RESULT_PASSED) {
diff --git a/test/testgesture.c b/test/testgesture.c
index 89f5f368c35cf..f6658dbb3ca68 100644
--- a/test/testgesture.c
+++ b/test/testgesture.c
@@ -244,19 +244,19 @@ int main(int argc, char* argv[])
         break;
       case SDL_FINGERMOTION:
 #if VERBOSE
-        SDL_Log("Finger: %"PRIs64",x: %f, y: %f",event.tfinger.fingerId,
+        SDL_Log("Finger: %"SDL_PRIs64",x: %f, y: %f",event.tfinger.fingerId,
                event.tfinger.x,event.tfinger.y);
 #endif
         break;
       case SDL_FINGERDOWN:
 #if VERBOSE
-        SDL_Log("Finger: %"PRIs64" down - x: %f, y: %f",
+        SDL_Log("Finger: %"SDL_PRIs64" down - x: %f, y: %f",
            event.tfinger.fingerId,event.tfinger.x,event.tfinger.y);
 #endif
         break;
       case SDL_FINGERUP:
 #if VERBOSE
-        SDL_Log("Finger: %"PRIs64" up - x: %f, y: %f",
+        SDL_Log("Finger: %"SDL_PRIs64" up - x: %f, y: %f",
                event.tfinger.fingerId,event.tfinger.x,event.tfinger.y);
 #endif
         break;
@@ -275,12 +275,12 @@ int main(int argc, char* argv[])
         knob.r += event.mgesture.dDist;
         break;
       case SDL_DOLLARGESTURE:
-        SDL_Log("Gesture %"PRIs64" performed, error: %f",
+        SDL_Log("Gesture %"SDL_PRIs64" performed, error: %f",
            event.dgesture.gestureId,
            event.dgesture.error);
         break;
       case SDL_DOLLARRECORD:
-        SDL_Log("Recorded gesture: %"PRIs64"",event.dgesture.gestureId);
+        SDL_Log("Recorded gesture: %"SDL_PRIs64"",event.dgesture.gestureId);
         break;
       }
       }