Commit 68637199 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Follow up to r1804123 r1809633. 

Silence "-Wunknown-pragmas" on GCC...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810723 13f79535-47bb-0310-9956-ffa450edef68
parent 4ea9d897

modules/md/md_json.c

+8 −3
Original line number Diff line number Diff line
@@ -25,19 +25,24 @@ 
/* jansson thinks everyone compiles with the platform's cc in its fullest capabilities

 * when undefining their INLINEs, we get static, unused functions, arg 

 */

#if defined(__GNUC__)

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunknown-pragmas"

#pragma GCC diagnostic ignored "-Wunreachable-code"

#elif defined(__clang__)

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wunused-function"

#endif



#include <jansson_config.h>

#undef  JSON_INLINE

#define JSON_INLINE 

#include <jansson.h>



#pragma clang diagnostic pop

#if defined(__GNUC__)

#pragma GCC diagnostic pop

#elif defined(__clang__)

#pragma clang diagnostic pop

#endif



struct md_json_t {

    apr_pool_t *p;

test/httpdunit.c

+8 −1
Original line number Diff line number Diff line
@@ -15,15 +15,22 @@ 
 */



#include "apr.h"   /* for pid_t on Windows, needed by Check */



#if defined(__GNUC__)

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wstrict-prototypes"

#elif defined(__clang__)

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wstrict-prototypes"

#endif



#include "check.h"



#pragma clang diagnostic pop

#if defined(__GNUC__)

#pragma GCC diagnostic pop

#elif defined(__clang__)

#pragma clang diagnostic pop

#endif



#include "apr_general.h"

test/httpdunit.h

+7 −1
Original line number Diff line number Diff line
@@ -35,15 +35,21 @@ 


#include "apr.h"   /* for pid_t on Windows, needed by Check */



#if defined(__GNUC__)

#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wstrict-prototypes"

#elif defined(__clang__)

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wstrict-prototypes"

#endif



#include "check.h"



#pragma clang diagnostic pop

#if defined(__GNUC__)

#pragma GCC diagnostic pop

#elif defined(__clang__)

#pragma clang diagnostic pop

#endif



/*

 * Boilerplate Macros