On the trunk:

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

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

diff --git a/test/httpdunit.c b/test/httpdunit.c
index 1e7582353a66602fdc17ea79699a0844df8ad81f..66ff243a2cfa3abe6dc484f9c10fad513c0e505f 100644 (file)
--- a/test/httpdunit.c
+++ b/test/httpdunit.c
@@ -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)

diff --git a/test/httpdunit.h b/test/httpdunit.h
index 2fdee36e657f42fdbd967205c4f6ad9c8d7914ff..4df39b0d6e7135767f8d745ebe76edb4c2283d5f 100644 (file)
--- a/test/httpdunit.h
+++ b/test/httpdunit.h
@@ -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
  */

diff --git a/test/unit/authn.c b/test/unit/authn.c
index 67ef04a3c550f74ab2b5a189874008b65b686624..236248215c4f431a45dbfe2ab5e5b759e4be931e 100644 (file)
--- a/test/unit/authn.c
+++ b/test/unit/authn.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "check.h"
 #include "../httpdunit.h"
 
 #include "httpd.h"

diff --git a/test/unit/util.c b/test/unit/util.c
index 17c10931a59dfb381a69eb14a58973091fb73519..5cadfd89ba1137439a12a4ab7e10a463fc8d5c0b 100644 (file)
--- a/test/unit/util.c
+++ b/test/unit/util.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "check.h"
 #include "../httpdunit.h"
 
 #include "httpd.h"