Commit 6143c515 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Make log_fn not fail so miserably on VC6 


svn:r2896
parent d63d5cb1

src/common/log.c

+0 −1
Original line number Diff line number Diff line
@@ -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, ...)

src/common/log.h

+3 −0
Original line number Diff line number Diff line
@@ -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 */