diff options
| author | Stefan Fritsch <sf@apache.org> | 2012-02-21 21:36:37 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2012-02-21 21:36:37 +0000 |
| commit | cf345c451283f5a0037e08362de47ea3322e6a0d (patch) | |
| tree | 0f9fe89c4d1838dfd94851f0896f5e85ee46bfb9 /include/http_log.h | |
| parent | 8a9eab9a2c528367fac60d044d4a71616b80401e (diff) | |
| download | httpd-cf345c451283f5a0037e08362de47ea3322e6a0d.tar.gz | |
Add AP_HAVE_C99 to make correct check for C99 less onerous
Using __STDC_VERSION__ without checking if it is defined causes warnings
on C89.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1292043 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/http_log.h')
| -rw-r--r-- | include/http_log.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/http_log.h b/include/http_log.h index 66ed59ca7d..922500f1e1 100644 --- a/include/http_log.h +++ b/include/http_log.h @@ -358,7 +358,7 @@ AP_DECLARE(void) ap_log_error(const char *file, int line, int module_index, int level, apr_status_t status, const server_rec *s, const char *fmt, ...); #else -#if __STDC_VERSION__ >= 199901L +#ifdef AP_HAVE_C99 /* 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 */ @@ -401,7 +401,7 @@ AP_DECLARE(void) ap_log_perror(const char *file, int line, int module_index, int level, apr_status_t status, apr_pool_t *p, const char *fmt, ...); #else -#if __STDC_VERSION__ >= 199901L && defined(APLOG_MAX_LOGLEVEL) +#if defined(AP_HAVE_C99) && defined(APLOG_MAX_LOGLEVEL) /* need additional step to expand APLOG_MARK first */ #define ap_log_perror(...) ap_log_perror__(__VA_ARGS__) #define ap_log_perror__(file, line, mi, level, status, p, ...) \ @@ -443,7 +443,7 @@ AP_DECLARE(void) ap_log_rerror(const char *file, int line, int module_index, int level, apr_status_t status, const request_rec *r, const char *fmt, ...); #else -#if __STDC_VERSION__ >= 199901L +#ifdef AP_HAVE_C99 /* need additional step to expand APLOG_MARK first */ #define ap_log_rerror(...) ap_log_rerror__(__VA_ARGS__) #define ap_log_rerror__(file, line, mi, level, status, r, ...) \ @@ -487,7 +487,7 @@ AP_DECLARE(void) ap_log_cerror(const char *file, int line, int module_index, int level, apr_status_t status, const conn_rec *c, const char *fmt, ...); #else -#if __STDC_VERSION__ >= 199901L +#ifdef AP_HAVE_C99 /* need additional step to expand APLOG_MARK first */ #define ap_log_cerror(...) ap_log_cerror__(__VA_ARGS__) #define ap_log_cerror__(file, line, mi, level, status, c, ...) \ @@ -534,7 +534,7 @@ AP_DECLARE(void) ap_log_cserror(const char *file, int line, int module_index, const conn_rec *c, const server_rec *s, const char *fmt, ...); #else -#if __STDC_VERSION__ >= 199901L +#ifdef AP_HAVE_C99 /* need additional step to expand APLOG_MARK first */ #define ap_log_cserror(...) ap_log_cserror__(__VA_ARGS__) #define ap_log_cserror__(file, line, mi, level, status, c, s, ...) \ |