diff options
| author | Mladen Turk <mturk@apache.org> | 2009-02-17 17:51:17 +0000 |
|---|---|---|
| committer | Mladen Turk <mturk@apache.org> | 2009-02-17 17:51:17 +0000 |
| commit | 352af5ff8a357d82d1e7aa38186aed75b87e5059 (patch) | |
| tree | 8b27f0dba6976407f61e174e6175788c73f2fe7c | |
| parent | 24407caabc5c60f9fec334e5cb071bb0c46e79e0 (diff) | |
| download | httpd-352af5ff8a357d82d1e7aa38186aed75b87e5059.tar.gz | |
Add watchdog module to win32 build.
Since it can only operate as static module reference it inside modules.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@745172 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | Makefile.win | 1 | ||||
| -rw-r--r-- | libhttpd.dsp | 4 | ||||
| -rw-r--r-- | os/win32/modules.c | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win index 5adb2221d2..6e02c81992 100644 --- a/Makefile.win +++ b/Makefile.win @@ -834,6 +834,7 @@ BEGIN { modules\ssl\mod_ssl.h \ modules\mappers\mod_so.h \ modules\mappers\mod_rewrite.h \ + modules\mappers\mod_watchdog.h \ modules\cache\mod_cache.h ) do \ @copy %f "$(INSTDIR)\include" < .y > nul copy srclib\apr\Lib$(SHORT)\apr-1.lib "$(INSTDIR)\lib" <.y diff --git a/libhttpd.dsp b/libhttpd.dsp index 8dd7788272..3c902378d3 100644 --- a/libhttpd.dsp +++ b/libhttpd.dsp @@ -423,6 +423,10 @@ SOURCE=.\modules\mappers\mod_so.c # End Source File # Begin Source File +SOURCE=.\modules\mappers\mod_watchdog.c +# End Source File +# Begin Source File + SOURCE=.\modules\arch\win32\mod_win32.c # End Source File # Begin Source File diff --git a/os/win32/modules.c b/os/win32/modules.c index 252421f78a..fb34b3db43 100644 --- a/os/win32/modules.c +++ b/os/win32/modules.c @@ -27,6 +27,7 @@ extern module win32_module; extern module mpm_winnt_module; extern module http_module; extern module so_module; +extern module watchdog_module; AP_DECLARE_DATA module *ap_prelinked_modules[] = { &core_module, @@ -34,6 +35,7 @@ AP_DECLARE_DATA module *ap_prelinked_modules[] = { &mpm_winnt_module, &http_module, &so_module, + &watchdog_module, NULL }; @@ -43,6 +45,7 @@ ap_module_symbol_t ap_prelinked_module_symbols[] = { {"mpm_winnt_module", &mpm_winnt_module}, {"http_module", &http_module}, {"so_module", &so_module}, + {"watchdog_module", &watchdog_module}, {NULL, NULL} }; @@ -52,5 +55,6 @@ AP_DECLARE_DATA module *ap_preloaded_modules[] = { &mpm_winnt_module, &http_module, &so_module, + &watchdog_module, NULL }; |