From 79195454993b6cfff6b03354dbf1e045e77f83cb Mon Sep 17 00:00:00 2001
From: David CARLIER <devnexen@gmail.com>
Date: Sun, 12 Apr 2020 15:55:52 +0100
Subject: Better solution for ARM64 build fix (#315)

---
 src/afl-common.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/afl-common.c')

diff --git a/src/afl-common.c b/src/afl-common.c
index d8af353a..7eba6ae4 100644
--- a/src/afl-common.c
+++ b/src/afl-common.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <strings.h>
-#include <inttypes.h>
 
 #include "debug.h"
 #include "alloc-inl.h"
@@ -455,13 +454,13 @@ u8 *stringify_int(u8 *buf, size_t len, u64 val) {
   } while (0)
 
   /* 0-9999 */
-  CHK_FORMAT(1, 10000, "%" PRIu64, u64);
+  CHK_FORMAT(1, 10000, "%llu", u64);
 
   /* 10.0k - 99.9k */
   CHK_FORMAT(1000, 99.95, "%0.01fk", double);
 
   /* 100k - 999k */
-  CHK_FORMAT(1000, 1000, "%" PRIu64 "k", u64);
+  CHK_FORMAT(1000, 1000, "%lluk", u64);
 
   /* 1.00M - 9.99M */
   CHK_FORMAT(1000 * 1000, 9.995, "%0.02fM", double);
@@ -470,7 +469,7 @@ u8 *stringify_int(u8 *buf, size_t len, u64 val) {
   CHK_FORMAT(1000 * 1000, 99.95, "%0.01fM", double);
 
   /* 100M - 999M */
-  CHK_FORMAT(1000 * 1000, 1000, "%" PRIu64 "M", u64);
+  CHK_FORMAT(1000 * 1000, 1000, "%lluM", u64);
 
   /* 1.00G - 9.99G */
   CHK_FORMAT(1000LL * 1000 * 1000, 9.995, "%0.02fG", double);
@@ -522,13 +521,13 @@ u8 *stringify_float(u8 *buf, size_t len, double val) {
 u8 *stringify_mem_size(u8 *buf, size_t len, u64 val) {
 
   /* 0-9999 */
-  CHK_FORMAT(1, 10000, "%" PRIu64 " B", u64);
+  CHK_FORMAT(1, 10000, "%llu B", u64);
 
   /* 10.0k - 99.9k */
   CHK_FORMAT(1024, 99.95, "%0.01f kB", double);
 
   /* 100k - 999k */
-  CHK_FORMAT(1024, 1000, "%" PRIu64 " kB", u64);
+  CHK_FORMAT(1024, 1000, "%llu kB", u64);
 
   /* 1.00M - 9.99M */
   CHK_FORMAT(1024 * 1024, 9.995, "%0.02f MB", double);
@@ -537,7 +536,7 @@ u8 *stringify_mem_size(u8 *buf, size_t len, u64 val) {
   CHK_FORMAT(1024 * 1024, 99.95, "%0.01f MB", double);
 
   /* 100M - 999M */
-  CHK_FORMAT(1024 * 1024, 1000, "%" PRIu64 " MB", u64);
+  CHK_FORMAT(1024 * 1024, 1000, "%llu MB", u64);
 
   /* 1.00G - 9.99G */
   CHK_FORMAT(1024LL * 1024 * 1024, 9.995, "%0.02f GB", double);
@@ -615,13 +614,13 @@ u8 *u_stringify_int(u8 *buf, u64 val) {
   } while (0)
 
   /* 0-9999 */
-  CHK_FORMAT(1, 10000, "%" PRIu64, u64);
+  CHK_FORMAT(1, 10000, "%llu", u64);
 
   /* 10.0k - 99.9k */
   CHK_FORMAT(1000, 99.95, "%0.01fk", double);
 
   /* 100k - 999k */
-  CHK_FORMAT(1000, 1000, "%" PRIu64 "k", u64);
+  CHK_FORMAT(1000, 1000, "%lluk", u64);
 
   /* 1.00M - 9.99M */
   CHK_FORMAT(1000 * 1000, 9.995, "%0.02fM", double);
@@ -630,7 +629,7 @@ u8 *u_stringify_int(u8 *buf, u64 val) {
   CHK_FORMAT(1000 * 1000, 99.95, "%0.01fM", double);
 
   /* 100M - 999M */
-  CHK_FORMAT(1000 * 1000, 1000, "%" PRIu64 "M", u64);
+  CHK_FORMAT(1000 * 1000, 1000, "%lluM", u64);
 
   /* 1.00G - 9.99G */
   CHK_FORMAT(1000LL * 1000 * 1000, 9.995, "%0.02fG", double);
@@ -681,13 +680,13 @@ u8 *u_stringify_float(u8 *buf, double val) {
 u8 *u_stringify_mem_size(u8 *buf, u64 val) {
 
   /* 0-9999 */
-  CHK_FORMAT(1, 10000, "%" PRIu64 " B", u64);
+  CHK_FORMAT(1, 10000, "%llu B", u64);
 
   /* 10.0k - 99.9k */
   CHK_FORMAT(1024, 99.95, "%0.01f kB", double);
 
   /* 100k - 999k */
-  CHK_FORMAT(1024, 1000, "%" PRIu64 " kB", u64);
+  CHK_FORMAT(1024, 1000, "%llu kB", u64);
 
   /* 1.00M - 9.99M */
   CHK_FORMAT(1024 * 1024, 9.995, "%0.02f MB", double);
@@ -696,7 +695,7 @@ u8 *u_stringify_mem_size(u8 *buf, u64 val) {
   CHK_FORMAT(1024 * 1024, 99.95, "%0.01f MB", double);
 
   /* 100M - 999M */
-  CHK_FORMAT(1024 * 1024, 1000, "%" PRIu64 " MB", u64);
+  CHK_FORMAT(1024 * 1024, 1000, "%llu MB", u64);
 
   /* 1.00G - 9.99G */
   CHK_FORMAT(1024LL * 1024 * 1024, 9.995, "%0.02f GB", double);
-- 
cgit 1.4.1