summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2009-10-01 03:08:05 +0200
committerGuenter Knauf <fuankg@apache.org>2009-10-01 03:08:05 +0200
commit03266419b6044b8f538e702976f149901cfde114 (patch)
treef5b2fcb18286ca03303fda2a30df879f32fe2e57 /build
parentchange the callable functions in the mod_watchdog API (diff)
downloadapache2-03266419b6044b8f538e702976f149901cfde114.tar.xz
apache2-03266419b6044b8f538e702976f149901cfde114.zip
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
Diffstat (limited to 'build')
-rw-r--r--build/make_nw_export.awk12
-rw-r--r--build/nw_export.inc2
2 files changed, 11 insertions, 3 deletions
diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 60c7a56f95..c8939e90e6 100644
--- 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 a1f7adabf6..177519e5e7 100644
--- 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