diff options
| author | Mark Janes <mark.a.janes@intel.com> | 2016-02-09 14:32:43 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@intel.com> | 2016-02-09 17:49:20 -0800 |
| commit | 8b079968838b7cdd5175a5eb989b5fa9815edb57 (patch) | |
| tree | 666362e9e93ec88570aa524ad73c144a5128d83a | |
| parent | 2b2f6f4a6b39d1760fbe42294db8fef5e7238b5e (diff) | |
build: Use PRIx64 macros for 64-bit data types
| -rw-r--r-- | src/framework/test/t_dump.c | 6 | ||||
| -rw-r--r-- | src/tests/func/query/timestamp.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/framework/test/t_dump.c b/src/framework/test/t_dump.c index a7c5ed3..04f55c3 100644 --- a/src/framework/test/t_dump.c +++ b/src/framework/test/t_dump.c @@ -19,6 +19,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. +#define __STDC_FORMAT_MACROS +#include <inttypes.h> #include "test.h" bool @@ -40,10 +42,10 @@ t_dump_seq_image(cru_image_t *image) return; uint64_t seq = cru_refcount_get(&t->dump_seq); - t_assertf(seq <= 9999, "image sequence %llu exceeds 9999", seq); + t_assertf(seq <= 9999, "image sequence %" PRIu64 " exceeds 9999", seq); string_t filename = STRING_INIT; - string_printf(&filename, "%s.seq%04llu.png", t_name, seq); + string_printf(&filename, "%s.seq%04" PRIu64 ".png", t_name, seq); cru_image_write_file(image, string_data(&filename)); } diff --git a/src/tests/func/query/timestamp.c b/src/tests/func/query/timestamp.c index e56d996..e1358ef 100644 --- a/src/tests/func/query/timestamp.c +++ b/src/tests/func/query/timestamp.c @@ -19,6 +19,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. +#define __STDC_FORMAT_MACROS +#include <inttypes.h> #include <poll.h> #include <stdio.h> #include "tapi/t.h" @@ -49,8 +51,8 @@ get_timestamp(void) sizeof(results), results, sizeof *results, VK_QUERY_RESULT_64_BIT); - printf("top timestamp: %20lld (%016llx)\n", results[0], results[0]); - printf("bottom timestamp: %20lld (%016llx)\n", results[1], results[1]); + printf("top timestamp: %20" PRId64 " (%016" PRIx64 ")\n", results[0], results[0]); + printf("bottom timestamp: %20" PRId64 " (%016" PRIx64")\n", results[1], results[1]); return results[0]; } @@ -66,7 +68,7 @@ test_timestamp(void) freq = 1 / (t_physical_dev_props->limits.timestampPeriod * 1000); elapsed_ms = (b - a) / freq; - printf("difference: %llu - %llu = %llu\n", b / freq, a / freq, elapsed_ms); + printf("difference: %" PRIu64 " - %" PRIu64 " = %" PRIu64 "\n", b / freq, a / freq, elapsed_ms); if (elapsed_ms < 90 || elapsed_ms > 110) t_fail(); else |