Commit d29035c6 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

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
parent edfce19d

test/httpdunit.c

+8 −0
Original line number Diff line number Diff line
@@ -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)

test/httpdunit.h

+9 −0
Original line number Diff line number Diff line
@@ -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

 */

test/unit/authn.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 */



#include "check.h"

#include "../httpdunit.h"



#include "httpd.h"

test/unit/util.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 */



#include "check.h"

#include "../httpdunit.h"



#include "httpd.h"