First undefine before define; Watcom does not redefine.

Backport of r1004518.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1049888 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/nw_export.inc b/build/nw_export.inc
index 94d9a45a5acca17a595ac006a4c6b6880a98c99b..2643a871234501f5f628758427e372f39a745487 100644 (file)
--- a/build/nw_export.inc
+++ b/build/nw_export.inc
@@ -7,11 +7,17 @@
     so that httpd.h will not mess with them. This allows 
     them to pass untouched so that the AWK script can pick 
     them out of the preprocessed result file. */
+#undef  AP_DECLARE
 #define AP_DECLARE              AP_DECLARE
+#undef  AP_CORE_DECLARE
 #define AP_CORE_DECLARE         AP_CORE_DECLARE
+#undef  AP_DECLARE_NONSTD
 #define AP_DECLARE_NONSTD       AP_DECLARE_NONSTD
+#undef  AP_CORE_DECLARE_NONSTD
 #define AP_CORE_DECLARE_NONSTD  AP_CORE_DECLARE_NONSTD
+#undef  AP_DECLARE_HOOK
 #define AP_DECLARE_HOOK         AP_DECLARE_HOOK
+#undef  AP_DECLARE_DATA
 #define AP_DECLARE_DATA         AP_DECLARE_DATA
 #undef  APACHE_OS_H