mingw-wsl-patches

Fork

# HG changeset patch
# Parent 5dbe10346f0713bad82ef05a6ce7e46e797acf6e
Define CINTERFACE in test suite, where required.

* tests/headers.at (W32API_AT_REQUIRE_CINTERFACE): New macro.
(W32API_AT_CHECK_HEADERS_STANDALONE) [C++ && rpcproxy.h]: Use it.
(W32API_AT_CHECK_HEADERS_COMBINED) [C++]: Likewise.

diff --git a/wslapi/tests/headers.at b/wslapi/tests/headers.at
--- a/wslapi/tests/headers.at
+++ b/wslapi/tests/headers.at
@@ -277,10 +277,21 @@ zmouse.h dnl
 #
 m4_define([W32API_AT_HASH_INCLUDE],dnl
 [[#include <$1>
 ]])# W32API_AT_HASH_INCLUDE
 
+# W32API_AT_REQUIRE_CINTERFACE( CONDITION, REQUIRED )
+# ---------------------------------------------------
+# Emit conditional "#define CINTERFACE" source, if CONDITION is
+# a literal match to REQUIRED.
+#
+m4_define([W32API_AT_REQUIRE_CINTERFACE],[m4_if([$1],[$2],[dnl
+#ifndef CINTERFACE
+#define CINTERFACE 1
+#endif
+])])# W32API_AT_REQUIRE_CINTERFACE
+
 # W32API_AT_CHECK_HEADERS_STANDALONE( LANG )
 # ------------------------------------------
 # Check compilability and self-containment of all package headers,
 # when each is compiled individually, using the LANG compiler.
 #
@@ -289,10 +300,11 @@ AT_BANNER([Header integrity checks: stan
 m4_foreach_w([HEADER],W32API_AT_PACKAGE_HEADERS,[dnl
 AT_SETUP([#include <]HEADER[>])AT_KEYWORDS([$1 $1-headers])
 AS_VAR_APPEND([CPPFLAGS],[" -Wall -Wextra -Wsystem-headers"])
 MINGW_AT_CHECK_COMPILE([dnl
 #define __IN_W32API_TESTSUITE__ 1
+W32API_AT_REQUIRE_CINTERFACE([$1]HEADER,[C++rpcproxy.h])dnl
 W32API_AT_HASH_INCLUDE(HEADER)dnl
 int main(){ return 0; }])
 AT_CLEANUP
 ])])# W32API_AT_CHECK_HEADERS_STANDALONE
 #
@@ -309,10 +321,11 @@ m4_define([W32API_AT_CHECK_HEADERS_COMBI
 AT_SETUP([#include all; language = $1])AT_KEYWORDS([$1 $1-headers])
 AS_VAR_APPEND([CPPFLAGS],[" -Wall -Wextra -Wsystem-headers"])
 m4_if([$1],[C],AS_VAR_APPEND([CPPFLAGS],[" -Wno-deprecated-declarations"]))
 MINGW_AT_CHECK_COMPILE([dnl
 #define __IN_W32API_TESTSUITE__ 1
+W32API_AT_REQUIRE_CINTERFACE([$1],[C++])dnl
 m4_foreach_w([HEADER],W32API_AT_PACKAGE_HEADERS,[dnl
 W32API_AT_HASH_INCLUDE(HEADER)])
 int main(){ return __W32API_MAJOR_VERSION; }])
 AT_CLEANUP
 ])# W32API_AT_CHECK_HEADERS_COMBINED