VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-03 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

#pragma GCC diagnostic push/pop exist in gcc >= 4.6 only.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827372 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2018-03-20 22:39:48 +00:00
parent cb43a0b5a0
commit c42ef53578
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/md/md_json.c
View File

@ -28,10 +28,11 @@
* when undefining their INLINEs, we get static, unused functions, arg * when undefining their INLINEs, we get static, unused functions, arg
*/ */
#if defined(__GNUC__) #if defined(__GNUC__)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunreachable-code"
#endif #endif
#if defined(__clang__) #pragma GCC diagnostic ignored "-Wunreachable-code"
#elif defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-function"
#endif #endif
@ -42,9 +43,10 @@
#include <jansson.h> #include <jansson.h>
#if defined(__GNUC__) #if defined(__GNUC__)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#if defined(__clang__) #elif defined(__clang__)
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif

4
test/httpdunit.h
View File

@ -36,7 +36,9 @@
#include "apr.h" /* for pid_t on Windows, needed by Check */ #include "apr.h" /* for pid_t on Windows, needed by Check */
#if defined(__GNUC__) #if defined(__GNUC__)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#endif
#pragma GCC diagnostic ignored "-Wstrict-prototypes" #pragma GCC diagnostic ignored "-Wstrict-prototypes"
#elif defined(__clang__) #elif defined(__clang__)
#pragma clang diagnostic push #pragma clang diagnostic push
@ -46,7 +48,9 @@
#include "check.h" #include "check.h"
#if defined(__GNUC__) #if defined(__GNUC__)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
#elif defined(__clang__) #elif defined(__clang__)
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif