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/07/08 16:17:39 UTC
svn commit: r792154 - in /httpd/httpd/trunk: NWGNUmakefile
build/make_nw_export.awk build/nw_export.inc
modules/cluster/NWGNUmodheartbeat modules/cluster/NWGNUmodheartmonitor
modules/core/mod_watchdog.h
Author: fuankg
Date: Wed Jul 8 14:17:39 2009
New Revision: 792154
URL: http://svn.apache.org/viewvc?rev=792154&view=rev
Log:
finally fixed NetWare export list (thanks help from rjung).
Modified:
httpd/httpd/trunk/NWGNUmakefile
httpd/httpd/trunk/build/make_nw_export.awk
httpd/httpd/trunk/build/nw_export.inc
httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat
httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor
httpd/httpd/trunk/modules/core/mod_watchdog.h
Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=792154&r1=792153&r2=792154&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Wed Jul 8 14:17:39 2009
@@ -309,12 +309,6 @@
#
FILES_nlm_exports = \
@$(NWOS)/httpd.imp \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_exit \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_init \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_need \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_step \
- (AP$(VERSION_MAJMIN)) ap_watchdog_get_instance \
- (AP$(VERSION_MAJMIN)) ap_watchdog_register_callback \
$(EOLIST)
#
Modified: httpd/httpd/trunk/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/make_nw_export.awk?rev=792154&r1=792153&r2=792154&view=diff
==============================================================================
--- httpd/httpd/trunk/build/make_nw_export.awk (original)
+++ httpd/httpd/trunk/build/make_nw_export.awk Wed Jul 8 14:17:39 2009
@@ -25,24 +25,10 @@
#/ap_some_name/{next}
/ap_mpm_pod_/{next}
-function add_symbol (sym_name) {
- if (count) {
- found++
- }
- gsub (/ /, "", sym_name)
- line = line sym_name ",\n"
-
- if (count == 0) {
- printf(" %s", line)
- line = ""
- }
-}
-
/^[ \t]*AP([RU]|_CORE|_WD)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
sub("[ \t]*AP([RU]|_CORE|_WD)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
sub("[(].*", "")
sub("([^ ]* (^([ \t]*[(])))+", "")
-
add_symbol($0)
next
}
@@ -52,7 +38,17 @@
symbol = args[2]
sub("^[ \t]+", "", symbol)
sub("[ \t]+$", "", symbol)
+ add_symbol("ap_hook_" symbol)
+ add_symbol("ap_hook_get_" symbol)
+ add_symbol("ap_run_" symbol)
+ next
+}
+/^[ \t]*AP[RU]?_DECLARE_EXTERNAL_HOOK[^(]*[(][^)]*/ {
+ split($0, args, ",")
+ symbol = args[4]
+ sub("^[ \t]+", "", symbol)
+ sub("[ \t]+$", "", symbol)
add_symbol("ap_hook_" symbol)
add_symbol("ap_hook_get_" symbol)
add_symbol("ap_run_" symbol)
@@ -81,12 +77,19 @@
}
/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;$/ {
- varname = $NF;
- gsub( /[*;]/, "", varname);
- gsub( /\[.*\]/, "", varname);
- add_symbol(varname);
+ gsub(/[*;]/, "", $NF)
+ gsub(/\[.*\]/, "", $NF)
+ add_symbol($NF)
}
#END {
-# printf(" %s", line)
+# printf("\n\n#found: %d symbols.\n", found)
#}
+
+function add_symbol(sym_name) {
+ found++
+ sub (" ", "", sym_name)
+ printf(" %s,\n", sym_name)
+}
+
+
Modified: httpd/httpd/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/nw_export.inc?rev=792154&r1=792153&r2=792154&view=diff
==============================================================================
--- httpd/httpd/trunk/build/nw_export.inc (original)
+++ httpd/httpd/trunk/build/nw_export.inc Wed Jul 8 14:17:39 2009
@@ -7,13 +7,14 @@
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. */
-#define AP_DECLARE AP_DECLARE
-#define AP_CORE_DECLARE AP_CORE_DECLARE
-#define AP_DECLARE_NONSTD AP_DECLARE_NONSTD
-#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 AP_DECLARE AP_DECLARE
+#define AP_CORE_DECLARE AP_CORE_DECLARE
+#define AP_DECLARE_NONSTD AP_DECLARE_NONSTD
+#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_EXTERNAL_HOOK APR_DECLARE_EXTERNAL_HOOK
#undef APACHE_OS_H
#include "httpd.h"
Modified: httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat?rev=792154&r1=792153&r2=792154&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat (original)
+++ httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat Wed Jul 8 14:17:39 2009
@@ -215,10 +215,6 @@
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_exit \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_init \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_need \
- (AP$(VERSION_MAJMIN)) ap_hook_watchdog_step \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor?rev=792154&r1=792153&r2=792154&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor (original)
+++ httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor Wed Jul 8 14:17:39 2009
@@ -215,8 +215,6 @@
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
- (AP$(VERSION_MAJMIN)) ap_watchdog_get_instance \
- (AP$(VERSION_MAJMIN)) ap_watchdog_register_callback \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/core/mod_watchdog.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.h?rev=792154&r1=792153&r2=792154&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.h (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.h Wed Jul 8 14:17:39 2009
@@ -88,6 +88,7 @@
/* Create a set of AP_WD_DECLARE(type), AP_WD_DECLARE_NONSTD(type) and
* AP_WD_DECLARE_DATA with appropriate export and import tags for the platform
*/
+#if !defined(AP_WD_DECLARE)
#if !defined(WIN32)
#define AP_WD_DECLARE(type) type
#define AP_WD_DECLARE_NONSTD(type) type
@@ -105,6 +106,7 @@
#define AP_WD_DECLARE_NONSTD(type) __declspec(dllimport) type
#define AP_WD_DECLARE_DATA __declspec(dllimport)
#endif
+#endif
/**
* Callback function used for watchdog.