Commit f505fd63 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent bfcfbfdd

include/ap_config.h

+5 −2
Original line number Diff line number Diff line
@@ -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

include/http_log.h

+5 −5
Original line number Diff line number Diff line
@@ -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, ...)  \