From 6143c515cd7125ee3ec440029858b53bc8bf79a2 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 15 Nov 2004 23:30:26 +0000
Subject: Make log_fn not fail so miserably on VC6

svn:r2896
---
 src/common/log.c | 1 -
 src/common/log.h | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/log.c b/src/common/log.c
index 18676b8bf1..780f5bdea9 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 00eebd05c5..b981ab4388 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 */
-- 
cgit v1.2.3-54-g00ecf