You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/06/09 23:23:48 UTC
svn commit: r953166 - /httpd/httpd/trunk/include/http_log.h
Author: sf
Date: Wed Jun 9 21:23:48 2010
New Revision: 953166
URL: http://svn.apache.org/viewvc?rev=953166&view=rev
Log:
Fix build failure by reverting part of r953125
Modified:
httpd/httpd/trunk/include/http_log.h
Modified: httpd/httpd/trunk/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_log.h?rev=953166&r1=953165&r2=953166&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_log.h (original)
+++ httpd/httpd/trunk/include/http_log.h Wed Jun 9 21:23:48 2010
@@ -277,9 +277,10 @@ void ap_logs_child_init(apr_pool_t *p, s
#if __STDC_VERSION__ >= 199901L
/* need additional step to expand APLOG_MARK first */
#define ap_log_error(...) ap_log_error__(__VA_ARGS__)
+/* need server_rec *sr = ... for the case if s is verbatim NULL */
#define ap_log_error__(file, line, mi, level, status, s, ...) \
- do { if (APLOG_MODULE_IS_LEVEL(s, mi, level)) \
- ap_log_error_(file, line, mi, level, status, s, __VA_ARGS__); \
+ do { server_rec *sr = s; if (APLOG_MODULE_IS_LEVEL(sr, mi, level)) \
+ ap_log_error_(file, line, mi, level, status, sr, __VA_ARGS__); \
} while(0)
#else
#define ap_log_error ap_log_error_