first trial to fix the export list for recent mod_watchdog changes ...

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

diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 60c7a56f955664ff395d5b9daa296971093adaf0..c8939e90e64faa4f684c1a3e066c39943c13179d 100644 (file)
--- a/build/make_nw_export.awk
+++ b/build/make_nw_export.awk
@@ -25,8 +25,8 @@ BEGIN {
 #/ap_some_name/{next}
 /ap_mpm_pod_/{next}
 
-/^[ \t]*AP([RU]|_CORE|_WD)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
-    sub("[ \t]*AP([RU]|_CORE|_WD)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
+/^[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
+    sub("[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
     sub("[(].*", "")
     sub("([^ ]* (^([ \t]*[(])))+", "")
     add_symbol($0)
@@ -82,6 +82,14 @@ BEGIN {
     add_symbol($NF)
 }
 
+/^[ \t]*AP[RU]?_DECLARE_OPTIONAL_FN[^(]*[(][^)]*/ {
+    split($0, args, ",")
+    symbol = args[2]
+    sub("^[ \t]+", "", symbol)
+    add_symbol(symbol)
+    next
+}
+
 #END {
 #    printf("\n\n#found: %d symbols.\n", found)
 #}

diff --git a/build/nw_export.inc b/build/nw_export.inc
index a1f7adabf6cf28a770547aa4eeac175429852d65..177519e5e7f6c3f52db8882c7d8ac372134ddb02 100644 (file)
--- a/build/nw_export.inc
+++ b/build/nw_export.inc
@@ -13,7 +13,7 @@
 #define AP_CORE_DECLARE_NONSTD     AP_CORE_DECLARE_NONSTD
 #define AP_DECLARE_HOOK            AP_DECLARE_HOOK
 #define AP_DECLARE_DATA            AP_DECLARE_DATA
-#define AP_WD_DECLARE              AP_WD_DECLARE
+#define APR_DECLARE_OPTIONAL_FN    APR_DECLARE_OPTIONAL_FN
 #define APR_DECLARE_EXTERNAL_HOOK  APR_DECLARE_EXTERNAL_HOOK
 #undef  APACHE_OS_H