svn commit: r745172 - in /httpd/httpd/trunk: Makefile.win libhttpd.dsp os/win32/modules.c

[mt...@apache.org]

Author: mturk
Date: Tue Feb 17 17:51:17 2009
New Revision: 745172

URL: http://svn.apache.org/viewvc?rev=745172&view=rev
Log:
Add watchdog module to win32 build.
Since it can only operate as static module reference it inside modules.c

Modified:
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/libhttpd.dsp
    httpd/httpd/trunk/os/win32/modules.c

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=745172&r1=745171&r2=745172&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Tue Feb 17 17:51:17 2009
@@ -834,6 +834,7 @@
 		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

Modified: httpd/httpd/trunk/libhttpd.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/libhttpd.dsp?rev=745172&r1=745171&r2=745172&view=diff
==============================================================================
--- httpd/httpd/trunk/libhttpd.dsp (original)
+++ httpd/httpd/trunk/libhttpd.dsp Tue Feb 17 17:51:17 2009
@@ -423,6 +423,10 @@
 # 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

Modified: httpd/httpd/trunk/os/win32/modules.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/modules.c?rev=745172&r1=745171&r2=745172&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/modules.c (original)
+++ httpd/httpd/trunk/os/win32/modules.c Tue Feb 17 17:51:17 2009
@@ -27,6 +27,7 @@
 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 @@
   &mpm_winnt_module,
   &http_module,
   &so_module,
+  &watchdog_module,
   NULL
 };
 
@@ -43,6 +45,7 @@
   {"mpm_winnt_module", &mpm_winnt_module},
   {"http_module", &http_module},
   {"so_module", &so_module},
+  {"watchdog_module", &watchdog_module},
   {NULL, NULL}
 };
 
@@ -52,5 +55,6 @@
   &mpm_winnt_module,
   &http_module,
   &so_module,
+  &watchdog_module,
   NULL
 };