From 20d29c0537385ed4456e242a792784fc33344f3a Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 28 May 2015 17:33:18 +0100
Subject: [PATCH] fixup logging macros that incorrectly override the LOG()
 macro name

---
 atari/schedule.c    | 2 +-
 beos/schedule.cpp   | 2 +-
 image/image_cache.c | 2 +-
 javascript/jsapi.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/atari/schedule.c b/atari/schedule.c
index bb47cc623..5c652d541 100644
--- a/atari/schedule.c
+++ b/atari/schedule.c
@@ -29,7 +29,7 @@
 #ifdef DEBUG_SCHEDULER
 #include "utils/log.h"
 #else
-#define LOG(X)
+#define LOG(x...)
 #endif
 
 #define MS_NOW() ((clock() * 1000) / CLOCKS_PER_SEC)
diff --git a/beos/schedule.cpp b/beos/schedule.cpp
index 6bf6c974b..a9da53501 100644
--- a/beos/schedule.cpp
+++ b/beos/schedule.cpp
@@ -31,7 +31,7 @@ extern "C" {
 #ifdef DEBUG_BEOS_SCHEDULE
 #include "utils/log.h"
 #else
-#define LOG(X)
+#define LOG(x...)
 #endif
 }
 
diff --git a/image/image_cache.c b/image/image_cache.c
index 49285635f..046a399ed 100644
--- a/image/image_cache.c
+++ b/image/image_cache.c
@@ -419,7 +419,7 @@ nserror image_cache_fini(void)
 		    (image_cache->hit_count * 100) / op_count,
 		    (image_cache->miss_count * 100) / op_count,
 		    (image_cache->fail_count * 100) / op_count);
-		LOG("Cache total/hit/miss/fail (size) %zd/%zd/%zd/%zd (100%%/%"PRId64"%%/%"PRId64"%%/%"PRId64"%%)",
+		LOG("Cache total/hit/miss/fail (size) %"PRIu64"/%"PRIu64"/%"PRIu64"/%"PRIu64" (100%%/%"PRId64"%%/%"PRId64"%%/%"PRId64"%%)",
 		    op_size,
 		    image_cache->hit_size,
 		    image_cache->miss_size,
diff --git a/javascript/jsapi.c b/javascript/jsapi.c
index fced53218..7780e77e6 100644
--- a/javascript/jsapi.c
+++ b/javascript/jsapi.c
@@ -124,7 +124,7 @@ static JSBool heartbeat_callback(JSContext *cx)
 	}
 	priv->last = now;
 
-	JSLOG("Running heatbeat at %d end %d", now , priv->end);
+	JSLOG("Running heatbeat at %ld end %ld", (long)now, (long)priv->end);
 
 	if ((priv->cb != NULL) &&
 	    (now > priv->end)) {