Merge remote-tracking branch 'tvdw/fix-16563'

src/common/torlog.h

@@ -184,25 +184,25 @@ void log_fn_ratelim_(struct ratelim_t *ratelim, int severity,
 /** Log a message at level <b>severity</b>, using a pretty-printed version
  * of the current function name. */
 #define log_fn(severity, domain, args...)               \
-  log_fn_(severity, domain, __PRETTY_FUNCTION__, args)
+  log_fn_(severity, domain, __FUNCTION__, args)
 /** As log_fn, but use <b>ratelim</b> (an instance of ratelim_t) to control
  * the frequency at which messages can appear.
  */
 #define log_fn_ratelim(ratelim, severity, domain, args...)      \
-  log_fn_ratelim_(ratelim, severity, domain, __PRETTY_FUNCTION__, args)
+  log_fn_ratelim_(ratelim, severity, domain, __FUNCTION__, args)
 #define log_debug(domain, args...)                                      \
   STMT_BEGIN                                                            \
     if (PREDICT_UNLIKELY(log_global_min_severity_ == LOG_DEBUG))        \
-      log_fn_(LOG_DEBUG, domain, __PRETTY_FUNCTION__, args);            \
+      log_fn_(LOG_DEBUG, domain, __FUNCTION__, args);            \
   STMT_END
 #define log_info(domain, args...)                           \
-  log_fn_(LOG_INFO, domain, __PRETTY_FUNCTION__, args)
+  log_fn_(LOG_INFO, domain, __FUNCTION__, args)
 #define log_notice(domain, args...)                         \
-  log_fn_(LOG_NOTICE, domain, __PRETTY_FUNCTION__, args)
+  log_fn_(LOG_NOTICE, domain, __FUNCTION__, args)
 #define log_warn(domain, args...)                           \
-  log_fn_(LOG_WARN, domain, __PRETTY_FUNCTION__, args)
+  log_fn_(LOG_WARN, domain, __FUNCTION__, args)
 #define log_err(domain, args...)                            \
-  log_fn_(LOG_ERR, domain, __PRETTY_FUNCTION__, args)
+  log_fn_(LOG_ERR, domain, __FUNCTION__, args)
 
 #else /* ! defined(__GNUC__) */