From: Guenter Knauf <fuankg@apache.org>
Date: Tue, 5 Oct 2010 03:56:31 +0000 (+0000)
Subject: First undefine before define; Watcom does not redefine.
X-Git-Tag: 2.3.9~351
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21f609d0d4989b3391c757e4c483904b6bd5f96b;p=apache

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 177519e5e7..f1526150f8 100644
--- 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