diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-03-13 00:25:36 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-03-13 00:25:36 +0000 |
| commit | 0c132ee2a1be2a4f6ce081bc883d88dcd810e8b8 (patch) | |
| tree | b65b1a626cb3486ef8a3a3078760e9460223efb0 /src/common/log.h | |
| parent | bd8ffccae7e1bb4030f9ca5e6dd9c8918256de75 (diff) | |
| download | tor-0c132ee2a1be2a4f6ce081bc883d88dcd810e8b8.tar.gz tor-0c132ee2a1be2a4f6ce081bc883d88dcd810e8b8.zip | |
Instead of listing a set of compilers that prefers __func__ to __FUNCTION__, use autoconf. Also, prefer __func__ in our own code: __func__ is a C99 standard, whereas __FUNCTION__ is not. [Fixes bug 254.]
svn:r6144
Diffstat (limited to 'src/common/log.h')
| -rw-r--r-- | src/common/log.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/common/log.h b/src/common/log.h index cf2f727f5f..1b4c96e8fa 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -149,7 +149,7 @@ void _log_warn(uint32_t domain, const char *format, ...); void _log_err(uint32_t domain, const char *format, ...); #if defined(_MSC_VER) && _MSC_VER < 1300 -/* MSVC 6 and earlier don't have __FUNCTION__, or even __LINE__. */ +/* MSVC 6 and earlier don't have __func__, or even __LINE__. */ #define log_fn _log_fn #define log_debug _log_debug #define log_info _log_info @@ -170,18 +170,18 @@ extern const char *_log_fn_function_name; /* We abuse the comma operator here, since we can't use the standard * do {...} while (0) trick to wrap this macro, since the macro can't take * arguments. */ -#define log_fn (_log_fn_function_name=__FUNCTION__),_log_fn -#define log_debug (_log_fn_function_name=__FUNCTION__),_log_debug -#define log_info (_log_fn_function_name=__FUNCTION__),_log_info -#define log_notice (_log_fn_function_name=__FUNCTION__),_log_notice -#define log_warn (_log_fn_function_name=__FUNCTION__),_log_warn -#define log_err (_log_fn_function_name=__FUNCTION__),_log_err +#define log_fn (_log_fn_function_name=__func__),_log_fn +#define log_debug (_log_fn_function_name=__func__),_log_debug +#define log_info (_log_fn_function_name=__func__),_log_info +#define log_notice (_log_fn_function_name=__func__),_log_notice +#define log_warn (_log_fn_function_name=__func__),_log_warn +#define log_err (_log_fn_function_name=__func__),_log_err /* -#define debug (_log_fn_function_name=__FUNCTION__),_debug -#define info (_log_fn_function_name=__FUNCTION__),_info -#define notice (_log_fn_function_name=__FUNCTION__),_notice -#define warn (_log_fn_function_name=__FUNCTION__),_warn -#define err (_log_fn_function_name=__FUNCTION__),_err +#define debug (_log_fn_function_name=__func__),_debug +#define info (_log_fn_function_name=__func__),_info +#define notice (_log_fn_function_name=__func__),_notice +#define warn (_log_fn_function_name=__func__),_warn +#define err (_log_fn_function_name=__func__),_err */ #endif |