Switch to PRIx64 macros

Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/3e9a8051
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/3e9a8051
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/3e9a8051

Branch: refs/heads/c99-types
Commit: 3e9a80510ea8ebe9e95e1e24cce3f60d36c3b0ac
Parents: 04429b7
Author: Nick Wellnhofer <[email protected]>
Authored: Sun Nov 18 01:14:52 2012 +0100
Committer: Nick Wellnhofer <[email protected]>
Committed: Sun Nov 18 16:37:04 2012 +0100

----------------------------------------------------------------------
 charmonizer/src/Charmonizer/Test/TestIntegers.c    |    8 ++--
 clownfish/runtime/core/Clownfish/CharBuf.c         |    4 +-
 clownfish/runtime/core/Clownfish/Test.c            |   28 +++++++-------
 .../runtime/core/Clownfish/Test/Util/TestMemory.c  |    2 +-
 .../core/Clownfish/Test/Util/TestNumberUtils.c     |    2 +-
 clownfish/runtime/core/Clownfish/Util/Memory.c     |    6 ++--
 core/Clownfish/CharBuf.c                           |    4 +-
 core/Clownfish/Util/Memory.c                       |    6 ++--
 core/Lucy/Index/SkipStepper.c                      |    2 +-
 core/Lucy/Test.c                                   |   28 +++++++-------
 core/Lucy/Test/Store/TestCompoundFileWriter.c      |    2 +-
 core/Lucy/Test/Store/TestIOPrimitives.c            |    8 ++--
 core/Lucy/Test/Util/TestMemory.c                   |    2 +-
 core/Lucy/Test/Util/TestNumberUtils.c              |    2 +-
 14 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/charmonizer/src/Charmonizer/Test/TestIntegers.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Test/TestIntegers.c 
b/charmonizer/src/Charmonizer/Test/TestIntegers.c
index ffef508..4564c74 100644
--- a/charmonizer/src/Charmonizer/Test/TestIntegers.c
+++ b/charmonizer/src/Charmonizer/Test/TestIntegers.c
@@ -107,10 +107,10 @@ S_run_tests(TestBatch *batch) {
         OK((INT64_MAX == INT64_C(0x7FFFFFFFFFFFFFFF)), "INT64_MAX");
         OK((INT64_MIN == -INT64_C(0x7FFFFFFFFFFFFFFF) - 1), "INT64_MIN");
         OK((UINT64_MAX == UINT64_C(0xFFFFFFFFFFFFFFFF)), "UINT64_MAX");
-        sprintf(buf, "%"I64P, foo);
-        STR_EQ(buf, "-100", "I64P");
-        sprintf(buf, "%"U64P, bar);
-        STR_EQ(buf, "18000000000000000000", "U64P");
+        sprintf(buf, "%"PRId64, foo);
+        STR_EQ(buf, "-100", "PRId64");
+        sprintf(buf, "%"PRIu64, bar);
+        STR_EQ(buf, "18000000000000000000", "PRIu64");
     }
 #endif
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/clownfish/runtime/core/Clownfish/CharBuf.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/CharBuf.c 
b/clownfish/runtime/core/Clownfish/CharBuf.c
index 627aa58..8d6653a 100644
--- a/clownfish/runtime/core/Clownfish/CharBuf.c
+++ b/clownfish/runtime/core/Clownfish/CharBuf.c
@@ -251,7 +251,7 @@ CB_vcatf(CharBuf *self, const char *pattern, va_list args) {
                         else {
                             S_die_invalid_pattern(pattern_start);
                         }
-                        size = sprintf(buf, "%" I64P, val);
+                        size = sprintf(buf, "%" PRId64, val);
                         CB_Cat_Trusted_Str(self, buf, size);
                     }
                     break;
@@ -273,7 +273,7 @@ CB_vcatf(CharBuf *self, const char *pattern, va_list args) {
                         else {
                             S_die_invalid_pattern(pattern_start);
                         }
-                        size = sprintf(buf, "%" U64P, val);
+                        size = sprintf(buf, "%" PRIu64, val);
                         CB_Cat_Trusted_Str(self, buf, size);
                     }
                     break;

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/clownfish/runtime/core/Clownfish/Test.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test.c 
b/clownfish/runtime/core/Clownfish/Test.c
index d910bea..611d55c 100644
--- a/clownfish/runtime/core/Clownfish/Test.c
+++ b/clownfish/runtime/core/Clownfish/Test.c
@@ -53,7 +53,7 @@ TestBatch_init(TestBatch *self, int64_t num_tests) {
 
 void
 TestBatch_plan(TestBatch *self) {
-    printf("1..%" I64P "\n", self->num_tests);
+    printf("1..%" PRId64 "\n", self->num_tests);
 }
 
 bool_t
@@ -144,14 +144,14 @@ TestBatch_vtest_true(TestBatch *self, bool_t condition, 
const char *pattern,
     // Test condition and pass or fail.
     if (condition) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - ", self->test_num);
+        printf("not ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return false;
@@ -167,14 +167,14 @@ TestBatch_vtest_false(TestBatch *self, bool_t condition,
     // Test condition and pass or fail.
     if (!condition) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - ", self->test_num);
+        printf("not ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return false;
@@ -190,14 +190,14 @@ TestBatch_vtest_int_equals(TestBatch *self, long got, 
long expected,
     // Test condition and pass or fail.
     if (expected == got) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - Expected '%ld', got '%ld'\n    ",
+        printf("not ok %" PRId64 " - Expected '%ld', got '%ld'\n    ",
                self->test_num, expected, got);
         vprintf(pattern, args);
         printf("\n");
@@ -216,14 +216,14 @@ TestBatch_vtest_float_equals(TestBatch *self, double got, 
double expected,
     // Evaluate condition and pass or fail.
     if (diff > 0.00001) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - Expected '%f', got '%f'\n    ",
+        printf("not ok %" PRId64 " - Expected '%f', got '%f'\n    ",
                self->test_num, expected, got);
         vprintf(pattern, args);
         printf("\n");
@@ -241,14 +241,14 @@ TestBatch_vtest_string_equals(TestBatch *self, const char 
*got,
     // Test condition and pass or fail.
     if (strcmp(expected, got) == 0) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - Expected '%s', got '%s'\n    ",
+        printf("not ok %" PRId64 " - Expected '%s', got '%s'\n    ",
                self->test_num, expected, got);
         vprintf(pattern, args);
         printf("\n");
@@ -263,7 +263,7 @@ TestBatch_vpass(TestBatch *self, const char *pattern, 
va_list args) {
 
     // Update counter, indicate pass.
     self->num_passed++;
-    printf("ok %" I64P " - ", self->test_num);
+    printf("ok %" PRId64 " - ", self->test_num);
     vprintf(pattern, args);
     printf("\n");
 
@@ -277,7 +277,7 @@ TestBatch_vfail(TestBatch *self, const char *pattern, 
va_list args) {
 
     // Update counter, indicate failure.
     self->num_failed++;
-    printf("not ok %" I64P " - ", self->test_num);
+    printf("not ok %" PRId64 " - ", self->test_num);
     vprintf(pattern, args);
     printf("\n");
 
@@ -287,7 +287,7 @@ TestBatch_vfail(TestBatch *self, const char *pattern, 
va_list args) {
 void
 TestBatch_vskip(TestBatch *self, const char *pattern, va_list args) {
     self->test_num++;
-    printf("ok %" I64P " # SKIP ", self->test_num);
+    printf("ok %" PRId64 " # SKIP ", self->test_num);
     vprintf(pattern, args);
     printf("\n");
     self->num_skipped++;

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c 
b/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
index f06ddbc..f1f7d61 100644
--- a/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
+++ b/clownfish/runtime/core/Clownfish/Test/Util/TestMemory.c
@@ -32,7 +32,7 @@ test_oversize__growth_rate(TestBatch *batch) {
         uint64_t next_size = Memory_oversize((size_t)size + 1, sizeof(void*));
         if (next_size < size) {
             success = false;
-            FAIL(batch, "Asked for %" I64P ", got smaller amount %" I64P,
+            FAIL(batch, "Asked for %" PRId64 ", got smaller amount %" PRId64,
                  size + 1, next_size);
             break;
         }

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c 
b/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
index 0124a6c..c662e8e 100644
--- a/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
+++ b/clownfish/runtime/core/Clownfish/Test/Util/TestNumberUtils.c
@@ -173,7 +173,7 @@ test_c64(TestBatch *batch) {
         for (size_t i = 0; i < count; i++) {
             uint64_t got = NumUtil_decode_c64(&target);
             TEST_TRUE(batch, got == ints[i],
-                      "c64 %" U64P " == %" U64P, got, ints[i]);
+                      "c64 %" PRIu64 " == %" PRIu64, got, ints[i]);
             if (target > limit) { THROW(ERR, "overrun"); }
             NumUtil_skip_cint(&skip);
         }

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/clownfish/runtime/core/Clownfish/Util/Memory.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Util/Memory.c 
b/clownfish/runtime/core/Clownfish/Util/Memory.c
index 72754b2..0f52e98 100644
--- a/clownfish/runtime/core/Clownfish/Util/Memory.c
+++ b/clownfish/runtime/core/Clownfish/Util/Memory.c
@@ -25,7 +25,7 @@ void*
 Memory_wrapped_malloc(size_t count) {
     void *pointer = malloc(count);
     if (pointer == NULL && count != 0) {
-        fprintf(stderr, "Can't malloc %" U64P " bytes.\n", (uint64_t)count);
+        fprintf(stderr, "Can't malloc %" PRIu64 " bytes.\n", (uint64_t)count);
         exit(1);
     }
     return pointer;
@@ -35,7 +35,7 @@ void*
 Memory_wrapped_calloc(size_t count, size_t size) {
     void *pointer = calloc(count, size);
     if (pointer == NULL && count != 0) {
-        fprintf(stderr, "Can't calloc %" U64P " elements of size %" U64P ".\n",
+        fprintf(stderr, "Can't calloc %" PRIu64 " elements of size %" PRIu64 
".\n",
                 (uint64_t)count, (uint64_t)size);
         exit(1);
     }
@@ -46,7 +46,7 @@ void*
 Memory_wrapped_realloc(void *ptr, size_t size) {
     void *pointer = realloc(ptr, size);
     if (pointer == NULL && size != 0) {
-        fprintf(stderr, "Can't realloc %" U64P " bytes.\n", (uint64_t)size);
+        fprintf(stderr, "Can't realloc %" PRIu64 " bytes.\n", (uint64_t)size);
         exit(1);
     }
     return pointer;

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Clownfish/CharBuf.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/CharBuf.c b/core/Clownfish/CharBuf.c
index 553ce86..595f0a8 100644
--- a/core/Clownfish/CharBuf.c
+++ b/core/Clownfish/CharBuf.c
@@ -253,7 +253,7 @@ CB_vcatf(CharBuf *self, const char *pattern, va_list args) {
                         else {
                             S_die_invalid_pattern(pattern_start);
                         }
-                        size = sprintf(buf, "%" I64P, val);
+                        size = sprintf(buf, "%" PRId64, val);
                         CB_Cat_Trusted_Str(self, buf, size);
                     }
                     break;
@@ -275,7 +275,7 @@ CB_vcatf(CharBuf *self, const char *pattern, va_list args) {
                         else {
                             S_die_invalid_pattern(pattern_start);
                         }
-                        size = sprintf(buf, "%" U64P, val);
+                        size = sprintf(buf, "%" PRIu64, val);
                         CB_Cat_Trusted_Str(self, buf, size);
                     }
                     break;

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Clownfish/Util/Memory.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Util/Memory.c b/core/Clownfish/Util/Memory.c
index 72754b2..0f52e98 100644
--- a/core/Clownfish/Util/Memory.c
+++ b/core/Clownfish/Util/Memory.c
@@ -25,7 +25,7 @@ void*
 Memory_wrapped_malloc(size_t count) {
     void *pointer = malloc(count);
     if (pointer == NULL && count != 0) {
-        fprintf(stderr, "Can't malloc %" U64P " bytes.\n", (uint64_t)count);
+        fprintf(stderr, "Can't malloc %" PRIu64 " bytes.\n", (uint64_t)count);
         exit(1);
     }
     return pointer;
@@ -35,7 +35,7 @@ void*
 Memory_wrapped_calloc(size_t count, size_t size) {
     void *pointer = calloc(count, size);
     if (pointer == NULL && count != 0) {
-        fprintf(stderr, "Can't calloc %" U64P " elements of size %" U64P ".\n",
+        fprintf(stderr, "Can't calloc %" PRIu64 " elements of size %" PRIu64 
".\n",
                 (uint64_t)count, (uint64_t)size);
         exit(1);
     }
@@ -46,7 +46,7 @@ void*
 Memory_wrapped_realloc(void *ptr, size_t size) {
     void *pointer = realloc(ptr, size);
     if (pointer == NULL && size != 0) {
-        fprintf(stderr, "Can't realloc %" U64P " bytes.\n", (uint64_t)size);
+        fprintf(stderr, "Can't realloc %" PRIu64 " bytes.\n", (uint64_t)size);
         exit(1);
     }
     return pointer;

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Lucy/Index/SkipStepper.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SkipStepper.c b/core/Lucy/Index/SkipStepper.c
index 0af6b29..f07b9f3 100644
--- a/core/Lucy/Index/SkipStepper.c
+++ b/core/Lucy/Index/SkipStepper.c
@@ -51,7 +51,7 @@ SkipStepper_read_record(SkipStepper *self, InStream 
*instream) {
 CharBuf*
 SkipStepper_to_string(SkipStepper *self) {
     char *ptr = (char*)MALLOCATE(60);
-    size_t len = sprintf(ptr, "skip doc: %u file pointer: %" I64P,
+    size_t len = sprintf(ptr, "skip doc: %u file pointer: %" PRId64,
                          self->doc_id, self->filepos);
     return CB_new_steal_from_trusted_str(ptr, len, 60);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Lucy/Test.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test.c b/core/Lucy/Test.c
index 9762302..c0fc1f8 100644
--- a/core/Lucy/Test.c
+++ b/core/Lucy/Test.c
@@ -51,7 +51,7 @@ TestBatch_init(TestBatch *self, int64_t num_tests) {
 
 void
 TestBatch_plan(TestBatch *self) {
-    printf("1..%" I64P "\n", self->num_tests);
+    printf("1..%" PRId64 "\n", self->num_tests);
 }
 
 bool_t
@@ -142,14 +142,14 @@ TestBatch_vtest_true(TestBatch *self, bool_t condition, 
const char *pattern,
     // Test condition and pass or fail.
     if (condition) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - ", self->test_num);
+        printf("not ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return false;
@@ -165,14 +165,14 @@ TestBatch_vtest_false(TestBatch *self, bool_t condition,
     // Test condition and pass or fail.
     if (!condition) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - ", self->test_num);
+        printf("not ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return false;
@@ -188,14 +188,14 @@ TestBatch_vtest_int_equals(TestBatch *self, long got, 
long expected,
     // Test condition and pass or fail.
     if (expected == got) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - Expected '%ld', got '%ld'\n    ",
+        printf("not ok %" PRId64 " - Expected '%ld', got '%ld'\n    ",
                self->test_num, expected, got);
         vprintf(pattern, args);
         printf("\n");
@@ -214,14 +214,14 @@ TestBatch_vtest_float_equals(TestBatch *self, double got, 
double expected,
     // Evaluate condition and pass or fail.
     if (diff > 0.00001) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - Expected '%f', got '%f'\n    ",
+        printf("not ok %" PRId64 " - Expected '%f', got '%f'\n    ",
                self->test_num, expected, got);
         vprintf(pattern, args);
         printf("\n");
@@ -239,14 +239,14 @@ TestBatch_vtest_string_equals(TestBatch *self, const char 
*got,
     // Test condition and pass or fail.
     if (strcmp(expected, got) == 0) {
         self->num_passed++;
-        printf("ok %" I64P " - ", self->test_num);
+        printf("ok %" PRId64 " - ", self->test_num);
         vprintf(pattern, args);
         printf("\n");
         return true;
     }
     else {
         self->num_failed++;
-        printf("not ok %" I64P " - Expected '%s', got '%s'\n    ",
+        printf("not ok %" PRId64 " - Expected '%s', got '%s'\n    ",
                self->test_num, expected, got);
         vprintf(pattern, args);
         printf("\n");
@@ -261,7 +261,7 @@ TestBatch_vpass(TestBatch *self, const char *pattern, 
va_list args) {
 
     // Update counter, indicate pass.
     self->num_passed++;
-    printf("ok %" I64P " - ", self->test_num);
+    printf("ok %" PRId64 " - ", self->test_num);
     vprintf(pattern, args);
     printf("\n");
 
@@ -275,7 +275,7 @@ TestBatch_vfail(TestBatch *self, const char *pattern, 
va_list args) {
 
     // Update counter, indicate failure.
     self->num_failed++;
-    printf("not ok %" I64P " - ", self->test_num);
+    printf("not ok %" PRId64 " - ", self->test_num);
     vprintf(pattern, args);
     printf("\n");
 
@@ -285,7 +285,7 @@ TestBatch_vfail(TestBatch *self, const char *pattern, 
va_list args) {
 void
 TestBatch_vskip(TestBatch *self, const char *pattern, va_list args) {
     self->test_num++;
-    printf("ok %" I64P " # SKIP ", self->test_num);
+    printf("ok %" PRId64 " # SKIP ", self->test_num);
     vprintf(pattern, args);
     printf("\n");
     self->num_skipped++;

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Lucy/Test/Store/TestCompoundFileWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileWriter.c 
b/core/Lucy/Test/Store/TestCompoundFileWriter.c
index 80661dc..376f12d 100644
--- a/core/Lucy/Test/Store/TestCompoundFileWriter.c
+++ b/core/Lucy/Test/Store/TestCompoundFileWriter.c
@@ -122,7 +122,7 @@ test_offsets(TestBatch *batch) {
         int64_t offs = Obj_To_I64(offset);
         if (offs % 8 != 0) {
             offsets_ok = false;
-            FAIL(batch, "Offset %" I64P " for %s not a multiple of 8",
+            FAIL(batch, "Offset %" PRId64 " for %s not a multiple of 8",
                  offset, CB_Get_Ptr8(file));
             break;
         }

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Lucy/Test/Store/TestIOPrimitives.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestIOPrimitives.c 
b/core/Lucy/Test/Store/TestIOPrimitives.c
index 48ab66c..64e9c56 100644
--- a/core/Lucy/Test/Store/TestIOPrimitives.c
+++ b/core/Lucy/Test/Store/TestIOPrimitives.c
@@ -177,7 +177,7 @@ test_i64(TestBatch *batch) {
     for (i = 0; i < 1000; i++) {
         int64_t got = InStream_Read_I64(instream);
         if (got != ints[i]) {
-            FAIL(batch, "i64 round trip failed: %" I64P ", %" I64P,
+            FAIL(batch, "i64 round trip failed: %" PRId64 ", %" PRId64,
                  got, ints[i]);
             break;
         }
@@ -216,7 +216,7 @@ test_u64(TestBatch *batch) {
     for (i = 0; i < 1000; i++) {
         uint64_t got = InStream_Read_U64(instream);
         if (got != ints[i]) {
-            FAIL(batch, "u64 round trip failed: %" U64P ", %" U64P,
+            FAIL(batch, "u64 round trip failed: %" PRIu64 ", %" PRIu64,
                  got, ints[i]);
             break;
         }
@@ -297,7 +297,7 @@ test_c64(TestBatch *batch) {
     for (i = 0; i < 1000; i++) {
         uint64_t got = InStream_Read_C64(instream);
         if (got != ints[i]) {
-            FAIL(batch, "c64 round trip failed: %" U64P ", %" U64P,
+            FAIL(batch, "c64 round trip failed: %" PRIu64 ", %" PRIu64,
                  got, ints[i]);
             break;
         }
@@ -314,7 +314,7 @@ test_c64(TestBatch *batch) {
         uint64_t got = NumUtil_decode_c64(&buf);
         UNUSED_VAR(size);
         if (got != ints[i]) {
-            FAIL(batch, "Read_Raw_C64 failed: %" U64P ", %" U64P,
+            FAIL(batch, "Read_Raw_C64 failed: %" PRIu64 ", %" PRIu64,
                  got, ints[i]);
             break;
         }

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Lucy/Test/Util/TestMemory.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemory.c b/core/Lucy/Test/Util/TestMemory.c
index a8c3bb7..eea940a 100644
--- a/core/Lucy/Test/Util/TestMemory.c
+++ b/core/Lucy/Test/Util/TestMemory.c
@@ -32,7 +32,7 @@ test_oversize__growth_rate(TestBatch *batch) {
         uint64_t next_size = Memory_oversize((size_t)size + 1, sizeof(void*));
         if (next_size < size) {
             success = false;
-            FAIL(batch, "Asked for %" I64P ", got smaller amount %" I64P,
+            FAIL(batch, "Asked for %" PRId64 ", got smaller amount %" PRId64,
                  size + 1, next_size);
             break;
         }

http://git-wip-us.apache.org/repos/asf/lucy/blob/3e9a8051/core/Lucy/Test/Util/TestNumberUtils.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestNumberUtils.c 
b/core/Lucy/Test/Util/TestNumberUtils.c
index d09ffab..bad0f2b 100644
--- a/core/Lucy/Test/Util/TestNumberUtils.c
+++ b/core/Lucy/Test/Util/TestNumberUtils.c
@@ -170,7 +170,7 @@ test_c64(TestBatch *batch) {
         for (size_t i = 0; i < count; i++) {
             uint64_t got = NumUtil_decode_c64(&target);
             TEST_TRUE(batch, got == ints[i],
-                      "c64 %" U64P " == %" U64P, got, ints[i]);
+                      "c64 %" PRIu64 " == %" PRIu64, got, ints[i]);
             if (target > limit) { THROW(ERR, "overrun"); }
             NumUtil_skip_cint(&skip);
         }

Reply via email to