aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--lib/ephy-debug.h11
2 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c8f60b8d..3847ea375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-05-29 Christian Persch <chpe@cvs.gnome.org>
+ * lib/ephy-debug.h:
+
+ Use ISO style variable argument macros. Patch by Brian Cameron,
+ part of bug #141319.
+
+2004-05-29 Christian Persch <chpe@cvs.gnome.org>
+
* configure.in:
Add check for 'mkdtemp', since solaris doesn't have it.
@@ -7,6 +14,7 @@
* lib/ephy-file-helpers.c: (ephy_file_tmp_dir):
Error out if we don't have mkdtemp.
+ Part of bug #141319.
2004-05-29 Christian Persch <chpe@cvs.gnome.org>
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 0be7f73bc..9326d935a 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -34,6 +34,16 @@ G_BEGIN_DECLS
#define DISABLE_PROFILING
#endif
+#ifdef G_HAVE_ISO_VARARGS
+#ifdef DISABLE_LOGGING
+#define LOG(msg, ...)
+#else
+#define LOG(msg, ...) \
+g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
+ "[ %s ] " msg, \
+ __FILE__ , __VA_ARGS__);
+#endif
+#elif defined(G_HAVE_GNUC_VARARGS)
#ifdef DISABLE_LOGGING
#define LOG(msg, args...)
#else
@@ -42,6 +52,7 @@ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"[ %s ] " msg, \
__FILE__ , ## args);
#endif
+#endif
#ifdef DISABLE_PROFILING
#define START_PROFILER(name)