summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2015-05-28 17:33:18 +0100
committerVincent Sanders <vince@kyllikki.org>2015-05-28 17:33:18 +0100
commit20d29c0537385ed4456e242a792784fc33344f3a (patch)
treed19dbecbb9eb24a18a4b1077db3579752dcc6630
parent0d811963c1498aa625b5438bf66dbb677a0d4494 (diff)
downloadnetsurf-20d29c0537385ed4456e242a792784fc33344f3a.tar.gz
netsurf-20d29c0537385ed4456e242a792784fc33344f3a.tar.bz2
fixup logging macros that incorrectly override the LOG() macro name
-rw-r--r--atari/schedule.c2
-rw-r--r--beos/schedule.cpp2
-rw-r--r--image/image_cache.c2
-rw-r--r--javascript/jsapi.c2
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)) {