You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2009/10/01 03:08:06 UTC
svn commit: r820503 - in /httpd/httpd/trunk/build: make_nw_export.awk
nw_export.inc
Author: fuankg
Date: Thu Oct 1 01:08:05 2009
New Revision: 820503
URL: http://svn.apache.org/viewvc?rev=820503&view=rev
Log:
first trial to fix the export list for recent mod_watchdog changes ...
Modified:
httpd/httpd/trunk/build/make_nw_export.awk
httpd/httpd/trunk/build/nw_export.inc
Modified: httpd/httpd/trunk/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/make_nw_export.awk?rev=820503&r1=820502&r2=820503&view=diff
==============================================================================
--- httpd/httpd/trunk/build/make_nw_export.awk (original)
+++ httpd/httpd/trunk/build/make_nw_export.awk Thu Oct 1 01:08:05 2009
@@ -25,8 +25,8 @@
#/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 @@
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)
#}
Modified: httpd/httpd/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/nw_export.inc?rev=820503&r1=820502&r2=820503&view=diff
==============================================================================
--- httpd/httpd/trunk/build/nw_export.inc (original)
+++ httpd/httpd/trunk/build/nw_export.inc Thu Oct 1 01:08:05 2009
@@ -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