aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/ephy-debug.h11
2 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 3847ea375..4bbad50ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
* lib/ephy-debug.h:
+ Revert varargs change, it doesn't work for LOG("Message") without
+ arguments.
+
+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.
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 9326d935a..0be7f73bc 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -34,16 +34,6 @@ 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
@@ -52,7 +42,6 @@ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"[ %s ] " msg, \
__FILE__ , ## args);
#endif
-#endif
#ifdef DISABLE_PROFILING
#define START_PROFILER(name)