aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/log.c1
-rw-r--r--src/common/log.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/common/log.c b/src/common/log.c
index 18676b8bf..780f5bdea 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -203,7 +203,6 @@ void _log(int severity, const char *format, ...)
va_end(ap);
}
-
/** Output a message to the log, prefixed with a function name <b>fn</b>. */
#ifdef __GNUC__
void _log_fn(int severity, const char *fn, const char *format, ...)
diff --git a/src/common/log.h b/src/common/log.h
index 00eebd05c..b981ab438 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -80,6 +80,9 @@ void _log_fn(int severity, const char *funcname, const char *format, ...)
* of the current function name. */
#define log_fn(severity, args...) \
_log_fn(severity, __PRETTY_FUNCTION__, args)
+#elif defined(_MSC_VER) && _MSC_VER < 1300
+/* MSVC 6 and earlier don't have __FUNCTION__, or even __LINE__. */
+#define log_fn _log
#else
/* We don't have GCC's varargs macros, so use a global variable to pass the
* function name to log_fn */