First undefine before define; Watcom does not redefine.

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

diff --git a/build/nw_export.inc b/build/nw_export.inc
index 177519e5e7f6c3f52db8882c7d8ac372134ddb02..f1526150f80b921b95f5aa9352f54e554b167be7 100644 (file)
--- a/build/nw_export.inc
+++ b/build/nw_export.inc
@@ -7,13 +7,21 @@
     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  APR_DECLARE_OPTIONAL_FN
 #define APR_DECLARE_OPTIONAL_FN    APR_DECLARE_OPTIONAL_FN
+#undef  APR_DECLARE_EXTERNAL_HOOK
 #define APR_DECLARE_EXTERNAL_HOOK  APR_DECLARE_EXTERNAL_HOOK
 #undef  APACHE_OS_H