From ce84813a80287aa9a0b0a1128cd86e5c86d8f8d3 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 21 Jun 2014 11:24:06 -0700 Subject: [PATCH] commit 9e211e646f9d51dc1372c9f3c8f47a78caf4f2a5 Author: Sam Clegg Date: Fri Jun 20 12:52:11 2014 Fix win32 build which was failing due to missing PRIs64. This change adds definitions for the C99 PRIs16 and PRIu64 which are missing from on at last win32 and possibly other platforms. These already existed in testgesture.c so I removed them from there also. --- include/SDL_stdinc.h | 17 +++++++++++++++++ test/testgesture.c | 22 ---------------------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index bc5b2b695..c47ea4c3e 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -165,6 +165,23 @@ typedef uint64_t Uint64; /* @} *//* Basic data types */ +/* Make sure we have macros for printing 64 bit values. + * should define these but this is not true all platforms. + * (for example win32) */ +#ifndef PRIs64 +#ifdef __WIN32__ +#define PRIs64 "I64" +#else +#define PRIs64 "lld" +#endif +#endif +#ifndef PRIu64 +#ifdef __WIN32__ +#define PRIu64 "I64u" +#else +#define PRIu64 "llu" +#endif +#endif /* Annotations to help code analysis tools */ #ifdef SDL_DISABLE_ANALYZE_MACROS diff --git a/test/testgesture.c b/test/testgesture.c index 5a0d33337..89f5f368c 100644 --- a/test/testgesture.c +++ b/test/testgesture.c @@ -22,28 +22,6 @@ #include "SDL_touch.h" #include "SDL_gesture.h" -/* Make sure we have good macros for printing 32 and 64 bit values */ -#ifndef PRIs32 -#define PRIs32 "d" -#endif -#ifndef PRIu32 -#define PRIu32 "u" -#endif -#ifndef PRIs64 -#ifdef __WIN32__ -#define PRIs64 "I64" -#else -#define PRIs64 "lld" -#endif -#endif -#ifndef PRIu64 -#ifdef __WIN32__ -#define PRIu64 "I64u" -#else -#define PRIu64 "llu" -#endif -#endif - #define WIDTH 640 #define HEIGHT 480 #define BPP 4