diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-03-20 23:39:48 +0100 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-03-20 23:39:48 +0100 |
| commit | c42ef535782160c9ea42d9cee6e13c0cedd8794f (patch) | |
| tree | ea4205dbd83eb72b27ef90ab0f6bf0fab6f43fa6 | |
| parent | mod_ldap: fix format warnings. (diff) | |
| download | apache2-c42ef535782160c9ea42d9cee6e13c0cedd8794f.tar.xz apache2-c42ef535782160c9ea42d9cee6e13c0cedd8794f.zip | |
#pragma GCC diagnostic push/pop exist in gcc >= 4.6 only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827372 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/md/md_json.c | 8 | ||||
| -rw-r--r-- | test/httpdunit.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/modules/md/md_json.c b/modules/md/md_json.c index 25c5895c4f..fed9d5de59 100644 --- a/modules/md/md_json.c +++ b/modules/md/md_json.c @@ -28,10 +28,11 @@ * when undefining their INLINEs, we get static, unused functions, arg */ #if defined(__GNUC__) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) #pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunreachable-code" #endif -#if defined(__clang__) +#pragma GCC diagnostic ignored "-Wunreachable-code" +#elif defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-function" #endif @@ -42,9 +43,10 @@ #include <jansson.h> #if defined(__GNUC__) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) #pragma GCC diagnostic pop #endif -#if defined(__clang__) +#elif defined(__clang__) #pragma clang diagnostic pop #endif diff --git a/test/httpdunit.h b/test/httpdunit.h index d858417bcb..8c76d434a2 100644 --- a/test/httpdunit.h +++ b/test/httpdunit.h @@ -36,7 +36,9 @@ #include "apr.h" /* for pid_t on Windows, needed by Check */ #if defined(__GNUC__) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) #pragma GCC diagnostic push +#endif #pragma GCC diagnostic ignored "-Wstrict-prototypes" #elif defined(__clang__) #pragma clang diagnostic push @@ -46,7 +48,9 @@ #include "check.h" #if defined(__GNUC__) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) #pragma GCC diagnostic pop +#endif #elif defined(__clang__) #pragma clang diagnostic pop #endif |