httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1809633 - in /httpd/httpd/trunk/test: httpdunit.c httpdunit.h unit/authn.c unit/util.c
Date Mon, 25 Sep 2017 14:20:47 GMT
Author: icing
Date: Mon Sep 25 14:20:47 2017
New Revision: 1809633

URL: http://svn.apache.org/viewvc?rev=1809633&view=rev
Log:
On the trunk:

Fix for maintainer-mode compiler errors when including check.h in unit tests.


Modified:
    httpd/httpd/trunk/test/httpdunit.c
    httpd/httpd/trunk/test/httpdunit.h
    httpd/httpd/trunk/test/unit/authn.c
    httpd/httpd/trunk/test/unit/util.c

Modified: httpd/httpd/trunk/test/httpdunit.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/httpdunit.c?rev=1809633&r1=1809632&r2=1809633&view=diff
==============================================================================
--- httpd/httpd/trunk/test/httpdunit.c (original)
+++ httpd/httpd/trunk/test/httpdunit.c Mon Sep 25 14:20:47 2017
@@ -15,8 +15,16 @@
  */
 
 #include "apr.h"   /* for pid_t on Windows, needed by Check */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+
 #include "check.h"
 
+#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
+
 #include "apr_general.h"
 
 static Suite *main_test_suite(void)

Modified: httpd/httpd/trunk/test/httpdunit.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/httpdunit.h?rev=1809633&r1=1809632&r2=1809633&view=diff
==============================================================================
--- httpd/httpd/trunk/test/httpdunit.h (original)
+++ httpd/httpd/trunk/test/httpdunit.h Mon Sep 25 14:20:47 2017
@@ -34,8 +34,17 @@
  */
 
 #include "apr.h"   /* for pid_t on Windows, needed by Check */
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+
 #include "check.h"
 
+#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
+
 /*
  * Boilerplate Macros
  */

Modified: httpd/httpd/trunk/test/unit/authn.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/unit/authn.c?rev=1809633&r1=1809632&r2=1809633&view=diff
==============================================================================
--- httpd/httpd/trunk/test/unit/authn.c (original)
+++ httpd/httpd/trunk/test/unit/authn.c Mon Sep 25 14:20:47 2017
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "check.h"
 #include "../httpdunit.h"
 
 #include "httpd.h"

Modified: httpd/httpd/trunk/test/unit/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/unit/util.c?rev=1809633&r1=1809632&r2=1809633&view=diff
==============================================================================
--- httpd/httpd/trunk/test/unit/util.c (original)
+++ httpd/httpd/trunk/test/unit/util.c Mon Sep 25 14:20:47 2017
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "check.h"
 #include "../httpdunit.h"
 
 #include "httpd.h"



Mime
View raw message