VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add AP_HAVE_C99 to make correct check for C99 less onerous

Browse Source 
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
This commit is contained in:
Stefan Fritsch
2012-02-21 21:36:37 +00:00
parent 8a9eab9a2c
commit cf345c4512
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/ap_config.h
View File

@ -211,11 +211,14 @@
#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
#endif
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define AP_HAVE_C99
#endif
/* Presume that the compiler supports C99-style designated
* initializers if using GCC (but not G++), or for any other compiler
* which claims C99 support. */
#if (defined(__GNUC__) && !defined(__cplusplus)) \
|| (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
#if (defined(__GNUC__) && !defined(__cplusplus)) || defined(AP_HAVE_C99)
#define AP_HAVE_DESIGNATED_INITIALIZER
#endif

10
include/http_log.h
View File

@ -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, ...) \