switch to use SDL_PRI* macros for long long formatting everywhere.
authorEdward Rudd <urkle@outoforder.cc>
Wed, 03 Dec 2014 12:23:17 -0500
changeset 9260039714172dc3
parent 9259 3154de62258e
child 9261 ac20d283fe41
switch to use SDL_PRI* macros for long long formatting everywhere.
include/SDL_stdinc.h
src/test/SDL_test_common.c
test/testautomation.c
test/testautomation_platform.c
test/testautomation_rwops.c
test/testautomation_sdltest.c
test/testautomation_timer.c
test/testplatform.c
test/testtimer.c
     1.1 --- a/include/SDL_stdinc.h	Wed Dec 03 11:04:07 2014 -0500
     1.2 +++ b/include/SDL_stdinc.h	Wed Dec 03 12:23:17 2014 -0500
     1.3 @@ -186,6 +186,24 @@
     1.4  #define SDL_PRIu64 "llu"
     1.5  #endif
     1.6  #endif
     1.7 +#ifndef SDL_PRIx64
     1.8 +#ifdef PRIx64
     1.9 +#define SDL_PRIx64 PRIx64
    1.10 +#elif defined(__WIN32__)
    1.11 +#define SDL_PRIx64 "I64x"
    1.12 +#else
    1.13 +#define SDL_PRIx64 "llx"
    1.14 +#endif
    1.15 +#endif
    1.16 +#ifndef SDL_PRIX64
    1.17 +#ifdef PRIX64
    1.18 +#define SDL_PRIX64 PRIX64
    1.19 +#elif defined(__WIN32__)
    1.20 +#define SDL_PRIX64 "I64X"
    1.21 +#else
    1.22 +#define SDL_PRIX64 "llX"
    1.23 +#endif
    1.24 +#endif
    1.25  
    1.26  /* Annotations to help code analysis tools */
    1.27  #ifdef SDL_DISABLE_ANALYZE_MACROS
     2.1 --- a/src/test/SDL_test_common.c	Wed Dec 03 11:04:07 2014 -0500
     2.2 +++ b/src/test/SDL_test_common.c	Wed Dec 03 12:23:17 2014 -0500
     2.3 @@ -1204,10 +1204,10 @@
     2.4                  event->tfinger.dx, event->tfinger.dy, event->tfinger.pressure);
     2.5          break;
     2.6      case SDL_DOLLARGESTURE:
     2.7 -        SDL_Log("SDL_EVENT: Dollar gesture detect: %lld", event->dgesture.gestureId);
     2.8 +        SDL_Log("SDL_EVENT: Dollar gesture detect: %"SDL_PRIs64, event->dgesture.gestureId);
     2.9          break;
    2.10      case SDL_DOLLARRECORD:
    2.11 -        SDL_Log("SDL_EVENT: Dollar gesture record: %lld", event->dgesture.gestureId);
    2.12 +        SDL_Log("SDL_EVENT: Dollar gesture record: %"SDL_PRIs64, event->dgesture.gestureId);
    2.13          break;
    2.14      case SDL_MULTIGESTURE:
    2.15          SDL_Log("SDL_EVENT: Multi gesture fingers: %d", event->mgesture.numFingers);
     3.1 --- a/test/testautomation.c	Wed Dec 03 11:04:07 2014 -0500
     3.2 +++ b/test/testautomation.c	Wed Dec 03 12:23:17 2014 -0500
     3.3 @@ -62,7 +62,7 @@
     3.4              }
     3.5              else if (SDL_strcasecmp(argv[i], "--execKey") == 0) {
     3.6                  if (argv[i + 1]) {
     3.7 -                    SDL_sscanf(argv[i + 1], "%llu", (long long unsigned int *)&userExecKey);
     3.8 +                    SDL_sscanf(argv[i + 1], "%"SDL_PRIu64, (long long unsigned int *)&userExecKey);
     3.9                      consumed = 2;
    3.10                  }
    3.11              }
     4.1 --- a/test/testautomation_platform.c	Wed Dec 03 11:04:07 2014 -0500
     4.2 +++ b/test/testautomation_platform.c	Wed Dec 03 12:23:17 2014 -0500
     4.3 @@ -92,11 +92,7 @@
     4.4  
     4.5      /* Test 64 swap. */
     4.6      SDLTest_AssertCheck( SDL_Swap64(value64) == swapped64,
     4.7 -#ifdef _MSC_VER
     4.8 -             "SDL_Swap64(): 64 bit swapped: 0x%I64X => 0x%I64X",
     4.9 -#else
    4.10 -             "SDL_Swap64(): 64 bit swapped: 0x%llX => 0x%llX",
    4.11 -#endif
    4.12 +             "SDL_Swap64(): 64 bit swapped: 0x%"SDL_PRIX64" => 0x%"SDL_PRIX64,
    4.13               value64, SDL_Swap64(value64) );
    4.14  
    4.15     return TEST_COMPLETED;
     5.1 --- a/test/testautomation_rwops.c	Wed Dec 03 11:04:07 2014 -0500
     5.2 +++ b/test/testautomation_rwops.c	Wed Dec 03 12:23:17 2014 -0500
     5.3 @@ -105,7 +105,7 @@
     5.4     /* Set to start. */
     5.5     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
     5.6     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
     5.7 -   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %lli", i);
     5.8 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %"SDL_PRIs64, i);
     5.9  
    5.10     /* Test write. */
    5.11     s = SDL_RWwrite(rw, RWopsHelloWorldTestString, sizeof(RWopsHelloWorldTestString)-1, 1);
    5.12 @@ -120,12 +120,12 @@
    5.13     /* Test seek to random position */
    5.14     i = SDL_RWseek( rw, seekPos, RW_SEEK_SET );
    5.15     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.16 -   SDLTest_AssertCheck(i == (Sint64)seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %lli", seekPos, seekPos, i);
    5.17 +   SDLTest_AssertCheck(i == (Sint64)seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %"SDL_PRIs64, seekPos, seekPos, i);
    5.18  
    5.19     /* Test seek back to start */
    5.20     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
    5.21     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.22 -   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %lli", i);
    5.23 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %"SDL_PRIs64, i);
    5.24  
    5.25     /* Test read */
    5.26     s = SDL_RWread( rw, buf, 1, sizeof(RWopsHelloWorldTestString)-1 );
    5.27 @@ -144,7 +144,7 @@
    5.28     SDLTest_AssertPass("Call to SDL_RWseek(...,-4,RW_SEEK_CUR) succeeded");
    5.29     SDLTest_AssertCheck(
    5.30         i == (Sint64)(sizeof(RWopsHelloWorldTestString)-5),
    5.31 -       "Verify seek to -4 with SDL_RWseek (RW_SEEK_CUR), expected %i, got %lli",
    5.32 +       "Verify seek to -4 with SDL_RWseek (RW_SEEK_CUR), expected %i, got %"SDL_PRIs64,
    5.33         sizeof(RWopsHelloWorldTestString)-5,
    5.34         i);
    5.35  
    5.36 @@ -152,7 +152,7 @@
    5.37     SDLTest_AssertPass("Call to SDL_RWseek(...,-1,RW_SEEK_END) succeeded");
    5.38     SDLTest_AssertCheck(
    5.39         i == (Sint64)(sizeof(RWopsHelloWorldTestString)-2),
    5.40 -       "Verify seek to -1 with SDL_RWseek (RW_SEEK_END), expected %i, got %lli",
    5.41 +       "Verify seek to -1 with SDL_RWseek (RW_SEEK_END), expected %i, got %"SDL_PRIs64,
    5.42         sizeof(RWopsHelloWorldTestString)-2,
    5.43         i);
    5.44  
    5.45 @@ -161,7 +161,7 @@
    5.46     SDLTest_AssertPass("Call to SDL_RWseek(...,0,invalid_whence) succeeded");
    5.47     SDLTest_AssertCheck(
    5.48         i == (Sint64)(-1),
    5.49 -       "Verify seek with SDL_RWseek (invalid_whence); expected: -1, got %lli",
    5.50 +       "Verify seek with SDL_RWseek (invalid_whence); expected: -1, got %"SDL_PRIs64,
    5.51         i);
    5.52  }
    5.53  
    5.54 @@ -560,7 +560,7 @@
    5.55  
    5.56       /* Compare */
    5.57       SDLTest_AssertCheck(rv_mem == rv_file, "Verify returned read blocks matches for mem and file reads; got: rv_mem=%d rv_file=%d", rv_mem, rv_file);
    5.58 -     SDLTest_AssertCheck(sv_mem == sv_file, "Verify SEEK_END position matches for mem and file seeks; got: sv_mem=%llu sv_file=%llu", sv_mem, sv_file);
    5.59 +     SDLTest_AssertCheck(sv_mem == sv_file, "Verify SEEK_END position matches for mem and file seeks; got: sv_mem=%"SDL_PRIu64" sv_file=%"SDL_PRIu64, sv_mem, sv_file);
    5.60       SDLTest_AssertCheck(buffer_mem[slen] == 0, "Verify mem buffer termination; expected: 0, got: %d", buffer_mem[slen]);
    5.61       SDLTest_AssertCheck(buffer_file[slen] == 0, "Verify file buffer termination; expected: 0, got: %d", buffer_file[slen]);
    5.62       SDLTest_AssertCheck(
    5.63 @@ -668,7 +668,7 @@
    5.64       /* Test seek to start */
    5.65       result = SDL_RWseek( rw, 0, RW_SEEK_SET );
    5.66       SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.67 -     SDLTest_AssertCheck(result == 0, "Verify result from position 0 with SDL_RWseek, expected 0, got %lli", result);
    5.68 +     SDLTest_AssertCheck(result == 0, "Verify result from position 0 with SDL_RWseek, expected 0, got %"SDL_PRIs64, result);
    5.69  
    5.70       /* Read test data */
    5.71       BE16test = SDL_ReadBE16(rw);
    5.72 @@ -679,7 +679,7 @@
    5.73       SDLTest_AssertCheck(BE32test == BE32value, "Validate return value from SDL_ReadBE32, expected: %u, got: %u", BE32value, BE32test);
    5.74       BE64test = SDL_ReadBE64(rw);
    5.75       SDLTest_AssertPass("Call to SDL_ReadBE64()");
    5.76 -     SDLTest_AssertCheck(BE64test == BE64value, "Validate return value from SDL_ReadBE64, expected: %llu, got: %llu", BE64value, BE64test);
    5.77 +     SDLTest_AssertCheck(BE64test == BE64value, "Validate return value from SDL_ReadBE64, expected: %"SDL_PRIu64", got: %"SDL_PRIu64, BE64value, BE64test);
    5.78       LE16test = SDL_ReadLE16(rw);
    5.79       SDLTest_AssertPass("Call to SDL_ReadLE16()");
    5.80       SDLTest_AssertCheck(LE16test == LE16value, "Validate return value from SDL_ReadLE16, expected: %hu, got: %hu", LE16value, LE16test);
    5.81 @@ -688,7 +688,7 @@
    5.82       SDLTest_AssertCheck(LE32test == LE32value, "Validate return value from SDL_ReadLE32, expected: %u, got: %u", LE32value, LE32test);
    5.83       LE64test = SDL_ReadLE64(rw);
    5.84       SDLTest_AssertPass("Call to SDL_ReadLE64()");
    5.85 -     SDLTest_AssertCheck(LE64test == LE64value, "Validate return value from SDL_ReadLE64, expected: %llu, got: %llu", LE64value, LE64test);
    5.86 +     SDLTest_AssertCheck(LE64test == LE64value, "Validate return value from SDL_ReadLE64, expected: %"SDL_PRIu64", got: %"SDL_PRIu64, LE64value, LE64test);
    5.87  
    5.88       /* Close handle */
    5.89       cresult = SDL_RWclose(rw);
     6.1 --- a/test/testautomation_sdltest.c	Wed Dec 03 11:04:07 2014 -0500
     6.2 +++ b/test/testautomation_sdltest.c	Wed Dec 03 12:23:17 2014 -0500
     6.3 @@ -93,35 +93,35 @@
     6.4    result = (Sint64)SDLTest_RandomUint8();
     6.5    umax = (1 << 8) - 1;
     6.6    SDLTest_AssertPass("Call to SDLTest_RandomUint8");
     6.7 -  SDLTest_AssertCheck(result >= 0 && result <= (Sint64)umax, "Verify result value, expected: [0,%llu], got: %lld", umax, result);
     6.8 +  SDLTest_AssertCheck(result >= 0 && result <= (Sint64)umax, "Verify result value, expected: [0,%"SDL_PRIu64"], got: %"SDL_PRIs64, umax, result);
     6.9  
    6.10    result = (Sint64)SDLTest_RandomSint8();
    6.11    min = 0 - (1 << 7);
    6.12    max =     (1 << 7) - 1;
    6.13    SDLTest_AssertPass("Call to SDLTest_RandomSint8");
    6.14 -  SDLTest_AssertCheck(result >= min && result <= max, "Verify result value, expected: [%lld,%lld], got: %lld", min, max, result);
    6.15 +  SDLTest_AssertCheck(result >= min && result <= max, "Verify result value, expected: [%"SDL_PRIs64",%"SDL_PRIs64"], got: %"SDL_PRIs64, min, max, result);
    6.16  
    6.17    result = (Sint64)SDLTest_RandomUint16();
    6.18    umax = (1 << 16) - 1;
    6.19    SDLTest_AssertPass("Call to SDLTest_RandomUint16");
    6.20 -  SDLTest_AssertCheck(result >= 0 && result <= (Sint64)umax, "Verify result value, expected: [0,%llu], got: %lld", umax, result);
    6.21 +  SDLTest_AssertCheck(result >= 0 && result <= (Sint64)umax, "Verify result value, expected: [0,%"SDL_PRIu64"], got: %"SDL_PRIs64, umax, result);
    6.22  
    6.23    result = (Sint64)SDLTest_RandomSint16();
    6.24    min = 0 - (1 << 15);
    6.25    max =     (1 << 15) - 1;
    6.26    SDLTest_AssertPass("Call to SDLTest_RandomSint16");
    6.27 -  SDLTest_AssertCheck(result >= min && result <= max, "Verify result value, expected: [%lld,%lld], got: %lld", min, max, result);
    6.28 +  SDLTest_AssertCheck(result >= min && result <= max, "Verify result value, expected: [%"SDL_PRIs64",%"SDL_PRIs64"], got: %"SDL_PRIs64, min, max, result);
    6.29  
    6.30    result = (Sint64)SDLTest_RandomUint32();
    6.31    umax = ((Uint64)1 << 32) - 1;
    6.32    SDLTest_AssertPass("Call to SDLTest_RandomUint32");
    6.33 -  SDLTest_AssertCheck(result >= 0 && result <= (Sint64)umax, "Verify result value, expected: [0,%llu], got: %lld", umax, result);
    6.34 +  SDLTest_AssertCheck(result >= 0 && result <= (Sint64)umax, "Verify result value, expected: [0,%"SDL_PRIu64"], got: %"SDL_PRIs64, umax, result);
    6.35  
    6.36    result = (Sint64)SDLTest_RandomSint32();
    6.37    min = 0 - ((Sint64)1 << 31);
    6.38    max =     ((Sint64)1 << 31) - 1;
    6.39    SDLTest_AssertPass("Call to SDLTest_RandomSint32");
    6.40 -  SDLTest_AssertCheck(result >= min && result <= max, "Verify result value, expected: [%lld,%lld], got: %lld", min, max, result);
    6.41 +  SDLTest_AssertCheck(result >= min && result <= max, "Verify result value, expected: [%"SDL_PRIs64",%"SDL_PRIs64"], got: %"SDL_PRIs64, min, max, result);
    6.42  
    6.43    uresult = SDLTest_RandomUint64();
    6.44    SDLTest_AssertPass("Call to SDLTest_RandomUint64");
    6.45 @@ -166,63 +166,63 @@
    6.46    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
    6.47    SDLTest_AssertCheck(
    6.48      uresult == 10,
    6.49 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", uresult);
    6.50 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, uresult);
    6.51  
    6.52    /* RandomUintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
    6.53    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(10, 11, SDL_TRUE);
    6.54    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
    6.55    SDLTest_AssertCheck(
    6.56      uresult == 10 || uresult == 11,
    6.57 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", uresult);
    6.58 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, uresult);
    6.59  
    6.60    /* RandomUintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
    6.61    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(10, 12, SDL_TRUE);
    6.62    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
    6.63    SDLTest_AssertCheck(
    6.64      uresult == 10 || uresult == 11 || uresult == 12,
    6.65 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", uresult);
    6.66 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, uresult);
    6.67  
    6.68    /* RandomUintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
    6.69    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(10, 13, SDL_TRUE);
    6.70    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
    6.71    SDLTest_AssertCheck(
    6.72      uresult == 10 || uresult == 11 || uresult == 12 || uresult == 13,
    6.73 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", uresult);
    6.74 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, uresult);
    6.75  
    6.76    /* RandomUintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
    6.77    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(10, 20, SDL_TRUE);
    6.78    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
    6.79    SDLTest_AssertCheck(
    6.80      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
    6.81 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
    6.82 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
    6.83  
    6.84    /* RandomUintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
    6.85    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(20, 10, SDL_TRUE);
    6.86    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
    6.87    SDLTest_AssertCheck(
    6.88      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
    6.89 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
    6.90 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
    6.91  
    6.92    /* RandomUintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
    6.93    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(1, 20, SDL_FALSE);
    6.94    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
    6.95    SDLTest_AssertCheck(
    6.96      uresult == 0 || uresult == 21,
    6.97 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", uresult);
    6.98 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, uresult);
    6.99  
   6.100    /* RandomUintXBoundaryValue(0, 99, SDL_FALSE) returns 100 */
   6.101    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(0, 99, SDL_FALSE);
   6.102    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
   6.103    SDLTest_AssertCheck(
   6.104      uresult == 100,
   6.105 -    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %lld", uresult);
   6.106 +    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, uresult);
   6.107  
   6.108    /* RandomUintXBoundaryValue(1, 0xff, SDL_FALSE) returns 0 (no error) */
   6.109    uresult = (Uint64)SDLTest_RandomUint8BoundaryValue(1, 255, SDL_FALSE);
   6.110    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
   6.111    SDLTest_AssertCheck(
   6.112      uresult == 0,
   6.113 -    "Validate result value for parameters (1,255,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.114 +    "Validate result value for parameters (1,255,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.115    lastError = (char *)SDL_GetError();
   6.116    SDLTest_AssertPass("SDL_GetError()");
   6.117    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.118 @@ -232,7 +232,7 @@
   6.119    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
   6.120    SDLTest_AssertCheck(
   6.121      uresult == 0xff,
   6.122 -    "Validate result value for parameters (0,254,SDL_FALSE); expected: 0xff, got: %lld", uresult);
   6.123 +    "Validate result value for parameters (0,254,SDL_FALSE); expected: 0xff, got: %"SDL_PRIs64, uresult);
   6.124    lastError = (char *)SDL_GetError();
   6.125    SDLTest_AssertPass("SDL_GetError()");
   6.126    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.127 @@ -242,7 +242,7 @@
   6.128    SDLTest_AssertPass("Call to SDLTest_RandomUint8BoundaryValue");
   6.129    SDLTest_AssertCheck(
   6.130      uresult == 0,
   6.131 -    "Validate result value for parameters(0,255,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.132 +    "Validate result value for parameters(0,255,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.133    lastError = (char *)SDL_GetError();
   6.134    SDLTest_AssertPass("SDL_GetError()");
   6.135    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
   6.136 @@ -276,63 +276,63 @@
   6.137    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.138    SDLTest_AssertCheck(
   6.139      uresult == 10,
   6.140 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", uresult);
   6.141 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, uresult);
   6.142  
   6.143    /* RandomUintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
   6.144    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(10, 11, SDL_TRUE);
   6.145    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.146    SDLTest_AssertCheck(
   6.147      uresult == 10 || uresult == 11,
   6.148 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", uresult);
   6.149 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, uresult);
   6.150  
   6.151    /* RandomUintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
   6.152    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(10, 12, SDL_TRUE);
   6.153    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.154    SDLTest_AssertCheck(
   6.155      uresult == 10 || uresult == 11 || uresult == 12,
   6.156 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", uresult);
   6.157 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, uresult);
   6.158  
   6.159    /* RandomUintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
   6.160    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(10, 13, SDL_TRUE);
   6.161    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.162    SDLTest_AssertCheck(
   6.163      uresult == 10 || uresult == 11 || uresult == 12 || uresult == 13,
   6.164 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", uresult);
   6.165 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, uresult);
   6.166  
   6.167    /* RandomUintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.168    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(10, 20, SDL_TRUE);
   6.169    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.170    SDLTest_AssertCheck(
   6.171      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
   6.172 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
   6.173 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
   6.174  
   6.175    /* RandomUintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.176    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(20, 10, SDL_TRUE);
   6.177    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.178    SDLTest_AssertCheck(
   6.179      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
   6.180 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
   6.181 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
   6.182  
   6.183    /* RandomUintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
   6.184    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(1, 20, SDL_FALSE);
   6.185    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.186    SDLTest_AssertCheck(
   6.187      uresult == 0 || uresult == 21,
   6.188 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", uresult);
   6.189 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, uresult);
   6.190  
   6.191    /* RandomUintXBoundaryValue(0, 99, SDL_FALSE) returns 100 */
   6.192    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(0, 99, SDL_FALSE);
   6.193    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.194    SDLTest_AssertCheck(
   6.195      uresult == 100,
   6.196 -    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %lld", uresult);
   6.197 +    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, uresult);
   6.198  
   6.199    /* RandomUintXBoundaryValue(1, 0xffff, SDL_FALSE) returns 0 (no error) */
   6.200    uresult = (Uint64)SDLTest_RandomUint16BoundaryValue(1, 0xffff, SDL_FALSE);
   6.201    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.202    SDLTest_AssertCheck(
   6.203      uresult == 0,
   6.204 -    "Validate result value for parameters (1,0xffff,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.205 +    "Validate result value for parameters (1,0xffff,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.206    lastError = (char *)SDL_GetError();
   6.207    SDLTest_AssertPass("SDL_GetError()");
   6.208    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.209 @@ -342,7 +342,7 @@
   6.210    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.211    SDLTest_AssertCheck(
   6.212      uresult == 0xffff,
   6.213 -    "Validate result value for parameters (0,0xfffe,SDL_FALSE); expected: 0xffff, got: %lld", uresult);
   6.214 +    "Validate result value for parameters (0,0xfffe,SDL_FALSE); expected: 0xffff, got: %"SDL_PRIs64, uresult);
   6.215    lastError = (char *)SDL_GetError();
   6.216    SDLTest_AssertPass("SDL_GetError()");
   6.217    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.218 @@ -352,7 +352,7 @@
   6.219    SDLTest_AssertPass("Call to SDLTest_RandomUint16BoundaryValue");
   6.220    SDLTest_AssertCheck(
   6.221      uresult == 0,
   6.222 -    "Validate result value for parameters(0,0xffff,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.223 +    "Validate result value for parameters(0,0xffff,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.224    lastError = (char *)SDL_GetError();
   6.225    SDLTest_AssertPass("SDL_GetError()");
   6.226    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
   6.227 @@ -386,63 +386,63 @@
   6.228    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.229    SDLTest_AssertCheck(
   6.230      uresult == 10,
   6.231 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", uresult);
   6.232 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, uresult);
   6.233  
   6.234    /* RandomUintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
   6.235    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(10, 11, SDL_TRUE);
   6.236    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.237    SDLTest_AssertCheck(
   6.238      uresult == 10 || uresult == 11,
   6.239 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", uresult);
   6.240 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, uresult);
   6.241  
   6.242    /* RandomUintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
   6.243    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(10, 12, SDL_TRUE);
   6.244    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.245    SDLTest_AssertCheck(
   6.246      uresult == 10 || uresult == 11 || uresult == 12,
   6.247 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", uresult);
   6.248 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, uresult);
   6.249  
   6.250    /* RandomUintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
   6.251    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(10, 13, SDL_TRUE);
   6.252    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.253    SDLTest_AssertCheck(
   6.254      uresult == 10 || uresult == 11 || uresult == 12 || uresult == 13,
   6.255 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", uresult);
   6.256 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, uresult);
   6.257  
   6.258    /* RandomUintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.259    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(10, 20, SDL_TRUE);
   6.260    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.261    SDLTest_AssertCheck(
   6.262      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
   6.263 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
   6.264 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
   6.265  
   6.266    /* RandomUintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.267    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(20, 10, SDL_TRUE);
   6.268    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.269    SDLTest_AssertCheck(
   6.270      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
   6.271 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
   6.272 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
   6.273  
   6.274    /* RandomUintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
   6.275    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(1, 20, SDL_FALSE);
   6.276    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.277    SDLTest_AssertCheck(
   6.278      uresult == 0 || uresult == 21,
   6.279 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", uresult);
   6.280 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, uresult);
   6.281  
   6.282    /* RandomUintXBoundaryValue(0, 99, SDL_FALSE) returns 100 */
   6.283    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(0, 99, SDL_FALSE);
   6.284    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.285    SDLTest_AssertCheck(
   6.286      uresult == 100,
   6.287 -    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %lld", uresult);
   6.288 +    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, uresult);
   6.289  
   6.290    /* RandomUintXBoundaryValue(1, 0xffffffff, SDL_FALSE) returns 0 (no error) */
   6.291    uresult = (Uint64)SDLTest_RandomUint32BoundaryValue(1, 0xffffffff, SDL_FALSE);
   6.292    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.293    SDLTest_AssertCheck(
   6.294      uresult == 0,
   6.295 -    "Validate result value for parameters (1,0xffffffff,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.296 +    "Validate result value for parameters (1,0xffffffff,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.297    lastError = (char *)SDL_GetError();
   6.298    SDLTest_AssertPass("SDL_GetError()");
   6.299    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.300 @@ -452,7 +452,7 @@
   6.301    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.302    SDLTest_AssertCheck(
   6.303      uresult == 0xffffffff,
   6.304 -    "Validate result value for parameters (0,0xfffffffe,SDL_FALSE); expected: 0xffffffff, got: %lld", uresult);
   6.305 +    "Validate result value for parameters (0,0xfffffffe,SDL_FALSE); expected: 0xffffffff, got: %"SDL_PRIs64, uresult);
   6.306    lastError = (char *)SDL_GetError();
   6.307    SDLTest_AssertPass("SDL_GetError()");
   6.308    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.309 @@ -462,7 +462,7 @@
   6.310    SDLTest_AssertPass("Call to SDLTest_RandomUint32BoundaryValue");
   6.311    SDLTest_AssertCheck(
   6.312      uresult == 0,
   6.313 -    "Validate result value for parameters(0,0xffffffff,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.314 +    "Validate result value for parameters(0,0xffffffff,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.315    lastError = (char *)SDL_GetError();
   6.316    SDLTest_AssertPass("SDL_GetError()");
   6.317    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
   6.318 @@ -496,63 +496,63 @@
   6.319    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.320    SDLTest_AssertCheck(
   6.321      uresult == 10,
   6.322 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", uresult);
   6.323 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, uresult);
   6.324  
   6.325    /* RandomUintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
   6.326    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(10, 11, SDL_TRUE);
   6.327    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.328    SDLTest_AssertCheck(
   6.329      uresult == 10 || uresult == 11,
   6.330 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", uresult);
   6.331 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, uresult);
   6.332  
   6.333    /* RandomUintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
   6.334    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(10, 12, SDL_TRUE);
   6.335    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.336    SDLTest_AssertCheck(
   6.337      uresult == 10 || uresult == 11 || uresult == 12,
   6.338 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", uresult);
   6.339 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, uresult);
   6.340  
   6.341    /* RandomUintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
   6.342    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(10, 13, SDL_TRUE);
   6.343    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.344    SDLTest_AssertCheck(
   6.345      uresult == 10 || uresult == 11 || uresult == 12 || uresult == 13,
   6.346 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", uresult);
   6.347 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, uresult);
   6.348  
   6.349    /* RandomUintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.350    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(10, 20, SDL_TRUE);
   6.351    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.352    SDLTest_AssertCheck(
   6.353      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
   6.354 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
   6.355 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
   6.356  
   6.357    /* RandomUintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.358    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(20, 10, SDL_TRUE);
   6.359    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.360    SDLTest_AssertCheck(
   6.361      uresult == 10 || uresult == 11 || uresult == 19 || uresult == 20,
   6.362 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", uresult);
   6.363 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, uresult);
   6.364  
   6.365    /* RandomUintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
   6.366    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(1, 20, SDL_FALSE);
   6.367    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.368    SDLTest_AssertCheck(
   6.369      uresult == 0 || uresult == 21,
   6.370 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", uresult);
   6.371 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, uresult);
   6.372  
   6.373    /* RandomUintXBoundaryValue(0, 99, SDL_FALSE) returns 100 */
   6.374    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(0, 99, SDL_FALSE);
   6.375    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.376    SDLTest_AssertCheck(
   6.377      uresult == 100,
   6.378 -    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %lld", uresult);
   6.379 +    "Validate result value for parameters (0,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, uresult);
   6.380  
   6.381    /* RandomUintXBoundaryValue(1, 0xffffffffffffffff, SDL_FALSE) returns 0 (no error) */
   6.382    uresult = (Uint64)SDLTest_RandomUint64BoundaryValue(1, (Uint64)0xffffffffffffffffULL, SDL_FALSE);
   6.383    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.384    SDLTest_AssertCheck(
   6.385      uresult == 0,
   6.386 -    "Validate result value for parameters (1,0xffffffffffffffff,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.387 +    "Validate result value for parameters (1,0xffffffffffffffff,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.388    lastError = (char *)SDL_GetError();
   6.389    SDLTest_AssertPass("SDL_GetError()");
   6.390    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.391 @@ -562,7 +562,7 @@
   6.392    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.393    SDLTest_AssertCheck(
   6.394      uresult == (Uint64)0xffffffffffffffffULL,
   6.395 -    "Validate result value for parameters (0,0xfffffffffffffffe,SDL_FALSE); expected: 0xffffffffffffffff, got: %lld", uresult);
   6.396 +    "Validate result value for parameters (0,0xfffffffffffffffe,SDL_FALSE); expected: 0xffffffffffffffff, got: %"SDL_PRIs64, uresult);
   6.397    lastError = (char *)SDL_GetError();
   6.398    SDLTest_AssertPass("SDL_GetError()");
   6.399    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.400 @@ -572,7 +572,7 @@
   6.401    SDLTest_AssertPass("Call to SDLTest_RandomUint64BoundaryValue");
   6.402    SDLTest_AssertCheck(
   6.403      uresult == 0,
   6.404 -    "Validate result value for parameters(0,0xffffffffffffffff,SDL_FALSE); expected: 0, got: %lld", uresult);
   6.405 +    "Validate result value for parameters(0,0xffffffffffffffff,SDL_FALSE); expected: 0, got: %"SDL_PRIs64, uresult);
   6.406    lastError = (char *)SDL_GetError();
   6.407    SDLTest_AssertPass("SDL_GetError()");
   6.408    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
   6.409 @@ -606,63 +606,63 @@
   6.410    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.411    SDLTest_AssertCheck(
   6.412      sresult == 10,
   6.413 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", sresult);
   6.414 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, sresult);
   6.415  
   6.416    /* RandomSintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
   6.417    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(10, 11, SDL_TRUE);
   6.418    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.419    SDLTest_AssertCheck(
   6.420      sresult == 10 || sresult == 11,
   6.421 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", sresult);
   6.422 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, sresult);
   6.423  
   6.424    /* RandomSintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
   6.425    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(10, 12, SDL_TRUE);
   6.426    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.427    SDLTest_AssertCheck(
   6.428      sresult == 10 || sresult == 11 || sresult == 12,
   6.429 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", sresult);
   6.430 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, sresult);
   6.431  
   6.432    /* RandomSintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
   6.433    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(10, 13, SDL_TRUE);
   6.434    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.435    SDLTest_AssertCheck(
   6.436      sresult == 10 || sresult == 11 || sresult == 12 || sresult == 13,
   6.437 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", sresult);
   6.438 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, sresult);
   6.439  
   6.440    /* RandomSintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.441    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(10, 20, SDL_TRUE);
   6.442    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.443    SDLTest_AssertCheck(
   6.444      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.445 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.446 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.447  
   6.448    /* RandomSintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.449    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(20, 10, SDL_TRUE);
   6.450    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.451    SDLTest_AssertCheck(
   6.452      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.453 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.454 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.455  
   6.456    /* RandomSintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
   6.457    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(1, 20, SDL_FALSE);
   6.458    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.459    SDLTest_AssertCheck(
   6.460      sresult == 0 || sresult == 21,
   6.461 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", sresult);
   6.462 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, sresult);
   6.463  
   6.464    /* RandomSintXBoundaryValue(SCHAR_MIN, 99, SDL_FALSE) returns 100 */
   6.465    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(SCHAR_MIN, 99, SDL_FALSE);
   6.466    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.467    SDLTest_AssertCheck(
   6.468      sresult == 100,
   6.469 -    "Validate result value for parameters (SCHAR_MIN,99,SDL_FALSE); expected: 100, got: %lld", sresult);
   6.470 +    "Validate result value for parameters (SCHAR_MIN,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, sresult);
   6.471  
   6.472    /* RandomSintXBoundaryValue(SCHAR_MIN + 1, SCHAR_MAX, SDL_FALSE) returns SCHAR_MIN (no error) */
   6.473    sresult = (Sint64)SDLTest_RandomSint8BoundaryValue(SCHAR_MIN + 1, SCHAR_MAX, SDL_FALSE);
   6.474    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.475    SDLTest_AssertCheck(
   6.476      sresult == SCHAR_MIN,
   6.477 -    "Validate result value for parameters (SCHAR_MIN + 1,SCHAR_MAX,SDL_FALSE); expected: %d, got: %lld", SCHAR_MIN, sresult);
   6.478 +    "Validate result value for parameters (SCHAR_MIN + 1,SCHAR_MAX,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, SCHAR_MIN, sresult);
   6.479    lastError = (char *)SDL_GetError();
   6.480    SDLTest_AssertPass("SDL_GetError()");
   6.481    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.482 @@ -672,7 +672,7 @@
   6.483    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.484    SDLTest_AssertCheck(
   6.485      sresult == SCHAR_MAX,
   6.486 -    "Validate result value for parameters (SCHAR_MIN,SCHAR_MAX - 1,SDL_FALSE); expected: %d, got: %lld", SCHAR_MAX, sresult);
   6.487 +    "Validate result value for parameters (SCHAR_MIN,SCHAR_MAX - 1,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, SCHAR_MAX, sresult);
   6.488    lastError = (char *)SDL_GetError();
   6.489    SDLTest_AssertPass("SDL_GetError()");
   6.490    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.491 @@ -682,7 +682,7 @@
   6.492    SDLTest_AssertPass("Call to SDLTest_RandomSint8BoundaryValue");
   6.493    SDLTest_AssertCheck(
   6.494      sresult == SCHAR_MIN,
   6.495 -    "Validate result value for parameters(SCHAR_MIN,SCHAR_MAX,SDL_FALSE); expected: %d, got: %lld", SCHAR_MIN, sresult);
   6.496 +    "Validate result value for parameters(SCHAR_MIN,SCHAR_MAX,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, SCHAR_MIN, sresult);
   6.497    lastError = (char *)SDL_GetError();
   6.498    SDLTest_AssertPass("SDL_GetError()");
   6.499    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
   6.500 @@ -716,63 +716,63 @@
   6.501    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.502    SDLTest_AssertCheck(
   6.503      sresult == 10,
   6.504 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", sresult);
   6.505 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, sresult);
   6.506  
   6.507    /* RandomSintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
   6.508    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(10, 11, SDL_TRUE);
   6.509    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.510    SDLTest_AssertCheck(
   6.511      sresult == 10 || sresult == 11,
   6.512 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", sresult);
   6.513 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, sresult);
   6.514  
   6.515    /* RandomSintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
   6.516    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(10, 12, SDL_TRUE);
   6.517    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.518    SDLTest_AssertCheck(
   6.519      sresult == 10 || sresult == 11 || sresult == 12,
   6.520 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", sresult);
   6.521 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, sresult);
   6.522  
   6.523    /* RandomSintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
   6.524    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(10, 13, SDL_TRUE);
   6.525    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.526    SDLTest_AssertCheck(
   6.527      sresult == 10 || sresult == 11 || sresult == 12 || sresult == 13,
   6.528 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", sresult);
   6.529 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, sresult);
   6.530  
   6.531    /* RandomSintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.532    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(10, 20, SDL_TRUE);
   6.533    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.534    SDLTest_AssertCheck(
   6.535      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.536 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.537 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.538  
   6.539    /* RandomSintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.540    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(20, 10, SDL_TRUE);
   6.541    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.542    SDLTest_AssertCheck(
   6.543      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.544 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.545 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.546  
   6.547    /* RandomSintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
   6.548    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(1, 20, SDL_FALSE);
   6.549    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.550    SDLTest_AssertCheck(
   6.551      sresult == 0 || sresult == 21,
   6.552 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", sresult);
   6.553 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, sresult);
   6.554  
   6.555    /* RandomSintXBoundaryValue(SHRT_MIN, 99, SDL_FALSE) returns 100 */
   6.556    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(SHRT_MIN, 99, SDL_FALSE);
   6.557    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.558    SDLTest_AssertCheck(
   6.559      sresult == 100,
   6.560 -    "Validate result value for parameters (SHRT_MIN,99,SDL_FALSE); expected: 100, got: %lld", sresult);
   6.561 +    "Validate result value for parameters (SHRT_MIN,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, sresult);
   6.562  
   6.563    /* RandomSintXBoundaryValue(SHRT_MIN + 1, SHRT_MAX, SDL_FALSE) returns SHRT_MIN (no error) */
   6.564    sresult = (Sint64)SDLTest_RandomSint16BoundaryValue(SHRT_MIN + 1, SHRT_MAX, SDL_FALSE);
   6.565    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.566    SDLTest_AssertCheck(
   6.567      sresult == SHRT_MIN,
   6.568 -    "Validate result value for parameters (SHRT_MIN+1,SHRT_MAX,SDL_FALSE); expected: %d, got: %lld", SHRT_MIN, sresult);
   6.569 +    "Validate result value for parameters (SHRT_MIN+1,SHRT_MAX,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, SHRT_MIN, sresult);
   6.570    lastError = (char *)SDL_GetError();
   6.571    SDLTest_AssertPass("SDL_GetError()");
   6.572    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.573 @@ -782,7 +782,7 @@
   6.574    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.575    SDLTest_AssertCheck(
   6.576      sresult == SHRT_MAX,
   6.577 -    "Validate result value for parameters (SHRT_MIN,SHRT_MAX - 1,SDL_FALSE); expected: %d, got: %lld", SHRT_MAX, sresult);
   6.578 +    "Validate result value for parameters (SHRT_MIN,SHRT_MAX - 1,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, SHRT_MAX, sresult);
   6.579    lastError = (char *)SDL_GetError();
   6.580    SDLTest_AssertPass("SDL_GetError()");
   6.581    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.582 @@ -792,7 +792,7 @@
   6.583    SDLTest_AssertPass("Call to SDLTest_RandomSint16BoundaryValue");
   6.584    SDLTest_AssertCheck(
   6.585      sresult == SHRT_MIN,
   6.586 -    "Validate result value for parameters(SHRT_MIN,SHRT_MAX,SDL_FALSE); expected: %d, got: %lld", SHRT_MIN, sresult);
   6.587 +    "Validate result value for parameters(SHRT_MIN,SHRT_MAX,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, SHRT_MIN, sresult);
   6.588    lastError = (char *)SDL_GetError();
   6.589    SDLTest_AssertPass("SDL_GetError()");
   6.590    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
   6.591 @@ -833,63 +833,63 @@
   6.592    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.593    SDLTest_AssertCheck(
   6.594      sresult == 10,
   6.595 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", sresult);
   6.596 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, sresult);
   6.597  
   6.598    /* RandomSintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
   6.599    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(10, 11, SDL_TRUE);
   6.600    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.601    SDLTest_AssertCheck(
   6.602      sresult == 10 || sresult == 11,
   6.603 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", sresult);
   6.604 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, sresult);
   6.605  
   6.606    /* RandomSintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
   6.607    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(10, 12, SDL_TRUE);
   6.608    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.609    SDLTest_AssertCheck(
   6.610      sresult == 10 || sresult == 11 || sresult == 12,
   6.611 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", sresult);
   6.612 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, sresult);
   6.613  
   6.614    /* RandomSintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
   6.615    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(10, 13, SDL_TRUE);
   6.616    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.617    SDLTest_AssertCheck(
   6.618      sresult == 10 || sresult == 11 || sresult == 12 || sresult == 13,
   6.619 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", sresult);
   6.620 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, sresult);
   6.621  
   6.622    /* RandomSintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.623    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(10, 20, SDL_TRUE);
   6.624    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.625    SDLTest_AssertCheck(
   6.626      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.627 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.628 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.629  
   6.630    /* RandomSintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.631    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(20, 10, SDL_TRUE);
   6.632    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.633    SDLTest_AssertCheck(
   6.634      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.635 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.636 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.637  
   6.638    /* RandomSintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
   6.639    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(1, 20, SDL_FALSE);
   6.640    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.641    SDLTest_AssertCheck(
   6.642      sresult == 0 || sresult == 21,
   6.643 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", sresult);
   6.644 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, sresult);
   6.645  
   6.646    /* RandomSintXBoundaryValue(LONG_MIN, 99, SDL_FALSE) returns 100 */
   6.647    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(long_min, 99, SDL_FALSE);
   6.648    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.649    SDLTest_AssertCheck(
   6.650      sresult == 100,
   6.651 -    "Validate result value for parameters (LONG_MIN,99,SDL_FALSE); expected: 100, got: %lld", sresult);
   6.652 +    "Validate result value for parameters (LONG_MIN,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, sresult);
   6.653  
   6.654    /* RandomSintXBoundaryValue(LONG_MIN + 1, LONG_MAX, SDL_FALSE) returns LONG_MIN (no error) */
   6.655    sresult = (Sint64)SDLTest_RandomSint32BoundaryValue(long_min + 1, long_max, SDL_FALSE);
   6.656    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.657    SDLTest_AssertCheck(
   6.658      sresult == long_min,
   6.659 -    "Validate result value for parameters (LONG_MIN+1,LONG_MAX,SDL_FALSE); expected: %d, got: %lld", long_min, sresult);
   6.660 +    "Validate result value for parameters (LONG_MIN+1,LONG_MAX,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, long_min, sresult);
   6.661    lastError = (char *)SDL_GetError();
   6.662    SDLTest_AssertPass("SDL_GetError()");
   6.663    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.664 @@ -899,7 +899,7 @@
   6.665    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.666    SDLTest_AssertCheck(
   6.667      sresult == long_max,
   6.668 -    "Validate result value for parameters (LONG_MIN,LONG_MAX - 1,SDL_FALSE); expected: %d, got: %lld", long_max, sresult);
   6.669 +    "Validate result value for parameters (LONG_MIN,LONG_MAX - 1,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, long_max, sresult);
   6.670    lastError = (char *)SDL_GetError();
   6.671    SDLTest_AssertPass("SDL_GetError()");
   6.672    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.673 @@ -909,7 +909,7 @@
   6.674    SDLTest_AssertPass("Call to SDLTest_RandomSint32BoundaryValue");
   6.675    SDLTest_AssertCheck(
   6.676      sresult == long_min,
   6.677 -    "Validate result value for parameters(LONG_MIN,LONG_MAX,SDL_FALSE); expected: %d, got: %lld", long_min, sresult);
   6.678 +    "Validate result value for parameters(LONG_MIN,LONG_MAX,SDL_FALSE); expected: %d, got: %"SDL_PRIs64, long_min, sresult);
   6.679    lastError = (char *)SDL_GetError();
   6.680    SDLTest_AssertPass("SDL_GetError()");
   6.681    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
   6.682 @@ -943,63 +943,63 @@
   6.683    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.684    SDLTest_AssertCheck(
   6.685      sresult == 10,
   6.686 -    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %lld", sresult);
   6.687 +    "Validate result value for parameters (10,10,SDL_TRUE); expected: 10, got: %"SDL_PRIs64, sresult);
   6.688  
   6.689    /* RandomSintXBoundaryValue(10, 11, SDL_TRUE) returns 10, 11 */
   6.690    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(10, 11, SDL_TRUE);
   6.691    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.692    SDLTest_AssertCheck(
   6.693      sresult == 10 || sresult == 11,
   6.694 -    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %lld", sresult);
   6.695 +    "Validate result value for parameters (10,11,SDL_TRUE); expected: 10|11, got: %"SDL_PRIs64, sresult);
   6.696  
   6.697    /* RandomSintXBoundaryValue(10, 12, SDL_TRUE) returns 10, 11, 12 */
   6.698    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(10, 12, SDL_TRUE);
   6.699    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.700    SDLTest_AssertCheck(
   6.701      sresult == 10 || sresult == 11 || sresult == 12,
   6.702 -    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %lld", sresult);
   6.703 +    "Validate result value for parameters (10,12,SDL_TRUE); expected: 10|11|12, got: %"SDL_PRIs64, sresult);
   6.704  
   6.705    /* RandomSintXBoundaryValue(10, 13, SDL_TRUE) returns 10, 11, 12, 13 */
   6.706    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(10, 13, SDL_TRUE);
   6.707    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.708    SDLTest_AssertCheck(
   6.709      sresult == 10 || sresult == 11 || sresult == 12 || sresult == 13,
   6.710 -    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %lld", sresult);
   6.711 +    "Validate result value for parameters (10,13,SDL_TRUE); expected: 10|11|12|13, got: %"SDL_PRIs64, sresult);
   6.712  
   6.713    /* RandomSintXBoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.714    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(10, 20, SDL_TRUE);
   6.715    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.716    SDLTest_AssertCheck(
   6.717      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.718 -    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.719 +    "Validate result value for parameters (10,20,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.720  
   6.721    /* RandomSintXBoundaryValue(20, 10, SDL_TRUE) returns 10, 11, 19 or 20 */
   6.722    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(20, 10, SDL_TRUE);
   6.723    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.724    SDLTest_AssertCheck(
   6.725      sresult == 10 || sresult == 11 || sresult == 19 || sresult == 20,
   6.726 -    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %lld", sresult);
   6.727 +    "Validate result value for parameters (20,10,SDL_TRUE); expected: 10|11|19|20, got: %"SDL_PRIs64, sresult);
   6.728  
   6.729    /* RandomSintXBoundaryValue(1, 20, SDL_FALSE) returns 0, 21 */
   6.730    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(1, 20, SDL_FALSE);
   6.731    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.732    SDLTest_AssertCheck(
   6.733      sresult == 0 || sresult == 21,
   6.734 -    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %lld", sresult);
   6.735 +    "Validate result value for parameters (1,20,SDL_FALSE); expected: 0|21, got: %"SDL_PRIs64, sresult);
   6.736  
   6.737    /* RandomSintXBoundaryValue(LLONG_MIN, 99, SDL_FALSE) returns 100 */
   6.738    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(LLONG_MIN, 99, SDL_FALSE);
   6.739    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.740    SDLTest_AssertCheck(
   6.741      sresult == 100,
   6.742 -    "Validate result value for parameters (LLONG_MIN,99,SDL_FALSE); expected: 100, got: %lld", sresult);
   6.743 +    "Validate result value for parameters (LLONG_MIN,99,SDL_FALSE); expected: 100, got: %"SDL_PRIs64, sresult);
   6.744  
   6.745    /* RandomSintXBoundaryValue(LLONG_MIN + 1, LLONG_MAX, SDL_FALSE) returns LLONG_MIN (no error) */
   6.746    sresult = (Sint64)SDLTest_RandomSint64BoundaryValue(LLONG_MIN + 1, LLONG_MAX, SDL_FALSE);
   6.747    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.748    SDLTest_AssertCheck(
   6.749      sresult == LLONG_MIN,
   6.750 -    "Validate result value for parameters (LLONG_MIN+1,LLONG_MAX,SDL_FALSE); expected: %lld, got: %lld", LLONG_MIN, sresult);
   6.751 +    "Validate result value for parameters (LLONG_MIN+1,LLONG_MAX,SDL_FALSE); expected: %"SDL_PRIs64", got: %"SDL_PRIs64, LLONG_MIN, sresult);
   6.752    lastError = (char *)SDL_GetError();
   6.753    SDLTest_AssertPass("SDL_GetError()");
   6.754    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.755 @@ -1009,7 +1009,7 @@
   6.756    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.757    SDLTest_AssertCheck(
   6.758      sresult == LLONG_MAX,
   6.759 -    "Validate result value for parameters (LLONG_MIN,LLONG_MAX - 1,SDL_FALSE); expected: %lld, got: %lld", LLONG_MAX, sresult);
   6.760 +    "Validate result value for parameters (LLONG_MIN,LLONG_MAX - 1,SDL_FALSE); expected: %"SDL_PRIs64", got: %"SDL_PRIs64, LLONG_MAX, sresult);
   6.761    lastError = (char *)SDL_GetError();
   6.762    SDLTest_AssertPass("SDL_GetError()");
   6.763    SDLTest_AssertCheck(lastError == NULL || lastError[0] == '\0', "Validate no error message was set");
   6.764 @@ -1019,7 +1019,7 @@
   6.765    SDLTest_AssertPass("Call to SDLTest_RandomSint64BoundaryValue");
   6.766    SDLTest_AssertCheck(
   6.767      sresult == LLONG_MIN,
   6.768 -    "Validate result value for parameters(LLONG_MIN,LLONG_MAX,SDL_FALSE); expected: %lld, got: %lld", LLONG_MIN, sresult);
   6.769 +    "Validate result value for parameters(LLONG_MIN,LLONG_MAX,SDL_FALSE); expected: %"SDL_PRIs64", got: %"SDL_PRIs64, LLONG_MIN, sresult);
   6.770    lastError = (char *)SDL_GetError();
   6.771    SDLTest_AssertPass("SDL_GetError()");
   6.772    SDLTest_AssertCheck(lastError != NULL && SDL_strcmp(lastError, expectedError) == 0,
     7.1 --- a/test/testautomation_timer.c	Wed Dec 03 11:04:07 2014 -0500
     7.2 +++ b/test/testautomation_timer.c	Wed Dec 03 12:23:17 2014 -0500
     7.3 @@ -42,7 +42,7 @@
     7.4  
     7.5    result = SDL_GetPerformanceCounter();
     7.6    SDLTest_AssertPass("Call to SDL_GetPerformanceCounter()");
     7.7 -  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %llu", result);
     7.8 +  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %"SDL_PRIu64, result);
     7.9  
    7.10    return TEST_COMPLETED;
    7.11  }
    7.12 @@ -57,7 +57,7 @@
    7.13  
    7.14    result = SDL_GetPerformanceFrequency();
    7.15    SDLTest_AssertPass("Call to SDL_GetPerformanceFrequency()");
    7.16 -  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %llu", result);
    7.17 +  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %"SDL_PRIu64, result);
    7.18  
    7.19    return TEST_COMPLETED;
    7.20  }
     8.1 --- a/test/testplatform.c	Wed Dec 03 11:04:07 2014 -0500
     8.2 +++ b/test/testplatform.c	Wed Dec 03 12:23:17 2014 -0500
     8.3 @@ -119,14 +119,8 @@
     8.4          ++error;
     8.5      }
     8.6      if (verbose) {
     8.7 -#ifdef _MSC_VER
     8.8 -        SDL_Log("Value 64 = 0x%I64X, swapped = 0x%I64X\n", value64,
     8.9 +        SDL_Log("Value 64 = 0x%"SDL_PRIX64", swapped = 0x%"SDL_PRIX64"\n", value64,
    8.10                 SDL_Swap64(value64));
    8.11 -#else
    8.12 -        SDL_Log("Value 64 = 0x%llX, swapped = 0x%llX\n",
    8.13 -               (unsigned long long) value64,
    8.14 -               (unsigned long long) SDL_Swap64(value64));
    8.15 -#endif
    8.16      }
    8.17      if (SDL_Swap64(value64) != swapped64) {
    8.18          if (verbose) {
     9.1 --- a/test/testtimer.c	Wed Dec 03 11:04:07 2014 -0500
     9.2 +++ b/test/testtimer.c	Wed Dec 03 12:23:17 2014 -0500
     9.3 @@ -107,7 +107,7 @@
     9.4      now = SDL_GetPerformanceCounter();
     9.5      SDL_Log("1 million iterations of ticktock took %f ms\n", (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
     9.6  
     9.7 -    SDL_Log("Performance counter frequency: %llu\n", (unsigned long long) SDL_GetPerformanceFrequency());
     9.8 +    SDL_Log("Performance counter frequency: %"PRIu64"\n", (unsigned long long) SDL_GetPerformanceFrequency());
     9.9      start32 = SDL_GetTicks();
    9.10      start = SDL_GetPerformanceCounter();
    9.11      SDL_Delay(1000);