Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 58DB6200D14 for ; Tue, 3 Oct 2017 11:26:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 579031609DD; Tue, 3 Oct 2017 09:26:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9D7A31609D2 for ; Tue, 3 Oct 2017 11:26:50 +0200 (CEST) Received: (qmail 60288 invoked by uid 500); 3 Oct 2017 09:26:49 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 60279 invoked by uid 99); 3 Oct 2017 09:26:49 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Oct 2017 09:26:49 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id ED96E3A0257 for ; Tue, 3 Oct 2017 09:26:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1810723 - in /httpd/httpd/trunk: modules/md/md_json.c test/httpdunit.c test/httpdunit.h Date: Tue, 03 Oct 2017 09:26:47 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171003092647.ED96E3A0257@svn01-us-west.apache.org> archived-at: Tue, 03 Oct 2017 09:26:51 -0000 Author: ylavic Date: Tue Oct 3 09:26:47 2017 New Revision: 1810723 URL: http://svn.apache.org/viewvc?rev=1810723&view=rev Log: Follow up to r1804123 r1809633. Silence "-Wunknown-pragmas" on GCC... Modified: httpd/httpd/trunk/modules/md/md_json.c httpd/httpd/trunk/test/httpdunit.c httpd/httpd/trunk/test/httpdunit.h Modified: httpd/httpd/trunk/modules/md/md_json.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_json.c?rev=1810723&r1=1810722&r2=1810723&view=diff ============================================================================== --- httpd/httpd/trunk/modules/md/md_json.c (original) +++ httpd/httpd/trunk/modules/md/md_json.c Tue Oct 3 09:26:47 2017 @@ -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 -#undef JSON_INLINE +#undef JSON_INLINE #define JSON_INLINE #include -#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; Modified: httpd/httpd/trunk/test/httpdunit.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/httpdunit.c?rev=1810723&r1=1810722&r2=1810723&view=diff ============================================================================== --- httpd/httpd/trunk/test/httpdunit.c (original) +++ httpd/httpd/trunk/test/httpdunit.c Tue Oct 3 09:26:47 2017 @@ -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" Modified: httpd/httpd/trunk/test/httpdunit.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/httpdunit.h?rev=1810723&r1=1810722&r2=1810723&view=diff ============================================================================== --- httpd/httpd/trunk/test/httpdunit.h (original) +++ httpd/httpd/trunk/test/httpdunit.h Tue Oct 3 09:26:47 2017 @@ -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