diff options
| author | Joe Orton <jorton@apache.org> | 2005-12-12 10:10:33 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2005-12-12 10:10:33 +0000 |
| commit | 2160d59157defbc2f11e158473b793c7bdeeccbc (patch) | |
| tree | f5ade0a8f3bb259b9eda7760725d88d669038d2a | |
| parent | 48904ff464cc2f53731395cc6132082367581830 (diff) | |
| download | httpd-2160d59157defbc2f11e158473b793c7bdeeccbc.tar.gz | |
* include/ap_config.h: Define AP_HAVE_DESIGNATED_INITIALIZER for GCC
(but not G++) or any compiler which claims C99 support.
* configure.in: Don't define AP_HAVE_DESIGNATED_INITIALIZER here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356234 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | include/ap_config.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 06436d4755..09ff3041a0 100644 --- a/configure.in +++ b/configure.in @@ -360,10 +360,6 @@ AC_HEADER_SYS_WAIT dnl ## Check for typedefs, structures, and compiler characteristics. AC_C_CONST -if test "x$GCC" = "xyes"; then - AC_DEFINE([AP_HAVE_DESIGNATED_INITIALIZER], 1, - [Define if the compiler supports designated initializers]) -fi dnl ## Check for library functions AC_SEARCH_LIBS(sqrt, m) diff --git a/include/ap_config.h b/include/ap_config.h index a580e67b49..8bd6e0de4f 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -252,4 +252,12 @@ #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE #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) +#define AP_HAVE_DESIGNATED_INITIALIZER +#endif + #endif /* AP_CONFIG_H */ |