httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ako...@hyperreal.org
Subject cvs commit: apache-1.3/src/os/win32 ApacheModuleAuthAnon.dsp ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp ApacheModuleDigest.mak ApacheModuleExpires.dsp ApacheModuleExpires.mak ApacheModuleHeaders.dsp ApacheModuleHeaders.mak ApacheModuleInfo.dsp ApacheModuleInfo.mak ApacheModuleRewrite.dsp ApacheModuleRewrite.mak ApacheModuleSpeling.dsp ApacheModuleSpeling.mak ApacheModuleStatus.dsp ApacheModuleStatus.mak ApacheModuleUserTrack.dsp ApacheModuleUserTrack.mak os.h
Date Mon, 06 Apr 1998 05:21:53 GMT
akosut      98/04/05 22:21:53

  Modified:    src      CHANGES
               src/include hsregex.h
               src/modules/proxy ApacheModuleProxy.dsp
                        ApacheModuleProxy.mak proxy_util.c
               src/modules/standard mod_status.c mod_usertrack.c
               src/os/win32 ApacheModuleAuthAnon.dsp
                        ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp
                        ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp
                        ApacheModuleDigest.mak ApacheModuleExpires.dsp
                        ApacheModuleExpires.mak ApacheModuleHeaders.dsp
                        ApacheModuleHeaders.mak ApacheModuleInfo.dsp
                        ApacheModuleInfo.mak ApacheModuleRewrite.dsp
                        ApacheModuleRewrite.mak ApacheModuleSpeling.dsp
                        ApacheModuleSpeling.mak ApacheModuleStatus.dsp
                        ApacheModuleStatus.mak ApacheModuleUserTrack.dsp
                        ApacheModuleUserTrack.mak os.h
  Log:
  Change IS_MODULE to SHARED_MODULE in Win32 to match Unix. Also remove
  IS_MODULE definitions from source files, move them to mak/dsp files
  (all of them).
  
  In related code, also have API_EXPORT use dllimport instead of
  dllexport when SHARED_MODULE is defined (according to the VC++
  docs, this results in "more efficient code") and fix API_EXPORT
  redefinition in hsregex.h.
  
  Revision  Changes    Path
  1.758     +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.757
  retrieving revision 1.758
  diff -u -u -r1.757 -r1.758
  --- CHANGES	1998/04/05 23:16:08	1.757
  +++ CHANGES	1998/04/06 05:21:40	1.758
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3b6
   
  +  *) Change Win32 IS_MODULE to SHARED_MODULE to match Unix' method of
  +     indicating that a module is being compiled for dynamic loading. Also
  +     remove #define IS_MODULE from modules and add SHARED_MODULE define
  +     to the mak/dsp files. [Alexei Kosut]
  +
     *) Reduce logging level of "normal" warning messages to APLOG_INFO,
        since we are now logging APLOG_WARNING by default. [Roy Fielding]
   
  
  
  
  1.5       +2 -0      apache-1.3/src/include/hsregex.h
  
  Index: hsregex.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/hsregex.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- hsregex.h	1997/07/16 00:41:25	1.4
  +++ hsregex.h	1998/04/06 05:21:41	1.5
  @@ -6,10 +6,12 @@
   #endif
   
   /* === regex2.h === */
  +#ifndef API_EXPORT
   #ifdef WIN32
   #define API_EXPORT(type)    __declspec(dllexport) type __stdcall
   #else
   #define API_EXPORT(type)    type
  +#endif
   #endif
   
   typedef off_t regoff_t;
  
  
  
  1.8       +2 -2      apache-1.3/src/modules/proxy/ApacheModuleProxy.dsp
  
  Index: ApacheModuleProxy.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- ApacheModuleProxy.dsp	1998/02/05 13:01:44	1.7
  +++ ApacheModuleProxy.dsp	1998/04/06 05:21:42	1.8
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +12 -6     apache-1.3/src/modules/proxy/ApacheModuleProxy.mak
  
  Index: ApacheModuleProxy.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleProxy.mak	1998/03/14 21:09:56	1.9
  +++ ApacheModuleProxy.mak	1998/04/06 05:21:42	1.10
  @@ -67,9 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -132,9 +132,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleProxy.pch"\
  + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -237,6 +237,7 @@
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
   	"..\..\include\explain.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_log.h"\
  @@ -299,6 +300,7 @@
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
   	"..\..\include\explain.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_log.h"\
  @@ -360,6 +362,7 @@
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
   	"..\..\include\explain.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_log.h"\
  @@ -418,6 +421,7 @@
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
   	"..\..\include\explain.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_main.h"\
  @@ -477,6 +481,7 @@
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
   	"..\..\include\explain.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
  @@ -539,6 +544,7 @@
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
   	"..\..\include\explain.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_log.h"\
  
  
  
  1.58      +0 -1      apache-1.3/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -u -r1.57 -r1.58
  --- proxy_util.c	1998/04/01 13:55:30	1.57
  +++ proxy_util.c	1998/04/06 05:21:42	1.58
  @@ -56,7 +56,6 @@
    */
   
   /* Utility routines for Apache proxy */
  -#define IS_MODULE
   #include "mod_proxy.h"
   #include "http_main.h"
   #include "md5.h"
  
  
  
  1.84      +0 -2      apache-1.3/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -u -r1.83 -r1.84
  --- mod_status.c	1998/03/31 12:53:22	1.83
  +++ mod_status.c	1998/04/06 05:21:43	1.84
  @@ -108,8 +108,6 @@
    * MODULE-DEFINITION-END
    */
   
  -#define IS_MODULE
  -
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
  
  
  
  1.33      +0 -1      apache-1.3/src/modules/standard/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_usertrack.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -u -r1.32 -r1.33
  --- mod_usertrack.c	1998/03/31 12:53:26	1.32
  +++ mod_usertrack.c	1998/04/06 05:21:44	1.33
  @@ -99,7 +99,6 @@
    * This file replaces mod_cookies.c
    */
   
  -#define IS_MODULE
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleAuthAnon.dsp
  
  Index: ApacheModuleAuthAnon.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthAnon.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleAuthAnon.dsp	1998/02/05 12:29:09	1.6
  +++ ApacheModuleAuthAnon.dsp	1998/04/06 05:21:45	1.7
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +38 -6     apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak
  
  Index: ApacheModuleAuthAnon.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleAuthAnon.mak	1998/02/05 12:29:04	1.9
  +++ ApacheModuleAuthAnon.mak	1998/04/06 05:21:45	1.10
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleAuthAnonR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,10 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\ApacheModuleAuthAnonD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -177,11 +178,15 @@
   !IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleAuthAnon - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_auth_anon.c
  +
  +!IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
  +
   DEP_CPP_MOD_A=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
  @@ -189,6 +194,7 @@
   	"..\..\include\http_protocol.h"\
   	"..\..\include\http_request.h"\
   	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -203,6 +209,32 @@
   "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
  +
  +DEP_CPP_MOD_A=\
  +	"..\..\include\alloc.h"\
  +	"..\..\include\ap.h"\
  +	"..\..\include\buff.h"\
  +	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
  +	"..\..\include\hsregex.h"\
  +	"..\..\include\http_config.h"\
  +	"..\..\include\http_core.h"\
  +	"..\..\include\http_log.h"\
  +	"..\..\include\http_protocol.h"\
  +	"..\..\include\http_request.h"\
  +	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +
  +"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleCERNMeta.dsp
  
  Index: ApacheModuleCERNMeta.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleCERNMeta.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleCERNMeta.dsp	1998/02/05 12:29:09	1.6
  +++ ApacheModuleCERNMeta.dsp	1998/04/06 05:21:45	1.7
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +37 -6     apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak
  
  Index: ApacheModuleCERNMeta.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleCERNMeta.mak	1998/02/05 12:29:04	1.9
  +++ ApacheModuleCERNMeta.mak	1998/04/06 05:21:45	1.10
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleCERNMetaR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,10 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\ApacheModuleCERNMetaD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -177,17 +178,22 @@
   !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleCERNMeta - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_cern_meta.c
  +
  +!IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
  +
   DEP_CPP_MOD_C=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_log.h"\
   	"..\..\include\http_request.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\util_script.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -202,6 +208,31 @@
   "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
  +
  +DEP_CPP_MOD_C=\
  +	"..\..\include\alloc.h"\
  +	"..\..\include\ap.h"\
  +	"..\..\include\buff.h"\
  +	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
  +	"..\..\include\hsregex.h"\
  +	"..\..\include\http_config.h"\
  +	"..\..\include\http_log.h"\
  +	"..\..\include\http_request.h"\
  +	"..\..\include\httpd.h"\
  +	"..\..\include\util_script.h"\
  +	"..\..\include\util_uri.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +
  +"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleDigest.dsp
  
  Index: ApacheModuleDigest.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleDigest.dsp	1998/02/05 12:29:10	1.6
  +++ ApacheModuleDigest.dsp	1998/04/06 05:21:45	1.7
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +17 -13    apache-1.3/src/os/win32/ApacheModuleDigest.mak
  
  Index: ApacheModuleDigest.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleDigest.mak	1998/02/05 12:29:05	1.9
  +++ ApacheModuleDigest.mak	1998/04/06 05:21:46	1.10
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleDigestR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleDigest.pch"\
  + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleDigestD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -185,6 +185,7 @@
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
  @@ -193,8 +194,16 @@
   	"..\..\include\httpd.h"\
   	"..\..\include\md5.h"\
   	"..\..\include\util_md5.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_D=\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\os.h"\
  +	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  @@ -208,6 +217,7 @@
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
  @@ -216,15 +226,9 @@
   	"..\..\include\httpd.h"\
   	"..\..\include\md5.h"\
   	"..\..\include\util_md5.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_D=\
  -	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
  -	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleExpires.dsp
  
  Index: ApacheModuleExpires.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleExpires.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleExpires.dsp	1998/02/05 12:29:10	1.6
  +++ ApacheModuleExpires.dsp	1998/04/06 05:21:46	1.7
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +34 -6     apache-1.3/src/os/win32/ApacheModuleExpires.mak
  
  Index: ApacheModuleExpires.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleExpires.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleExpires.mak	1998/02/05 12:29:06	1.9
  +++ ApacheModuleExpires.mak	1998/04/06 05:21:46	1.10
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleExpiresR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleExpires.pch"\
  + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleExpiresD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -177,15 +177,20 @@
   !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleExpires - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_expires.c
  +
  +!IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
  +
   DEP_CPP_MOD_E=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_log.h"\
   	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -200,6 +205,29 @@
   "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
  +
  +DEP_CPP_MOD_E=\
  +	"..\..\include\alloc.h"\
  +	"..\..\include\ap.h"\
  +	"..\..\include\buff.h"\
  +	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
  +	"..\..\include\hsregex.h"\
  +	"..\..\include\http_config.h"\
  +	"..\..\include\http_log.h"\
  +	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +
  +"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleHeaders.dsp
  
  Index: ApacheModuleHeaders.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleHeaders.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleHeaders.dsp	1998/02/05 12:29:11	1.6
  +++ ApacheModuleHeaders.dsp	1998/04/06 05:21:46	1.7
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +33 -6     apache-1.3/src/os/win32/ApacheModuleHeaders.mak
  
  Index: ApacheModuleHeaders.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleHeaders.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleHeaders.mak	1998/02/05 12:29:06	1.9
  +++ ApacheModuleHeaders.mak	1998/04/06 05:21:46	1.10
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleHeadersR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleHeaders.pch"\
  + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleHeadersD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -177,14 +177,19 @@
   !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleHeaders - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_headers.c
  +
  +!IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
  +
   DEP_CPP_MOD_H=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -199,6 +204,28 @@
   "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
  +
  +DEP_CPP_MOD_H=\
  +	"..\..\include\alloc.h"\
  +	"..\..\include\ap.h"\
  +	"..\..\include\buff.h"\
  +	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
  +	"..\..\include\hsregex.h"\
  +	"..\..\include\http_config.h"\
  +	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +
  +"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleInfo.dsp
  
  Index: ApacheModuleInfo.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleInfo.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleInfo.dsp	1998/02/05 12:29:11	1.6
  +++ ApacheModuleInfo.dsp	1998/04/06 05:21:47	1.7
  @@ -44,7 +44,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -70,7 +70,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.7       +8 -6      apache-1.3/src/os/win32/ApacheModuleInfo.mak
  
  Index: ApacheModuleInfo.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleInfo.mak,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleInfo.mak	1998/02/05 12:29:07	1.6
  +++ ApacheModuleInfo.mak	1998/04/06 05:21:47	1.7
  @@ -61,9 +61,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleInfoR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -115,9 +115,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleInfo.pch"\
  + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleInfoD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -180,6 +180,7 @@
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_conf_globals.h"\
   	"..\..\include\http_config.h"\
  @@ -189,6 +190,7 @@
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\util_script.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  
  
  
  1.10      +2 -2      apache-1.3/src/os/win32/ApacheModuleRewrite.dsp
  
  Index: ApacheModuleRewrite.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleRewrite.dsp	1998/03/09 22:43:05	1.9
  +++ ApacheModuleRewrite.dsp	1998/04/06 05:21:47	1.10
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +6 -14     apache-1.3/src/os/win32/ApacheModuleRewrite.mak
  
  Index: ApacheModuleRewrite.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleRewrite.mak	1998/03/09 22:43:06	1.9
  +++ ApacheModuleRewrite.mak	1998/04/06 05:21:47	1.10
  @@ -64,8 +64,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "NO_DBM_REWRITEMAP" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE"\
  + /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\ApacheModuleRewriteR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -122,7 +123,7 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP"\
  + "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE"\
    /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
    /FD /c 
   CPP_OBJS=.\ApacheModuleRewriteD/
  @@ -192,27 +193,17 @@
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  -	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
   	"..\..\include\http_log.h"\
   	"..\..\include\http_request.h"\
  -	"..\..\include\http_vhost.h"\
   	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\modules\standard\mod_rewrite.h"\
   	".\os.h"\
  +	".\passwd.h"\
   	".\readdir.h"\
  -	{$(INCLUDE)}"sys\locking.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
  -NODEP_CPP_MOD_R=\
  -	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
  -	"..\..\include\sfio.h"\
  -	
   
   "$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -225,6 +216,7 @@
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
  
  
  
  1.4       +2 -2      apache-1.3/src/os/win32/ApacheModuleSpeling.dsp
  
  Index: ApacheModuleSpeling.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleSpeling.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- ApacheModuleSpeling.dsp	1998/02/05 12:29:12	1.3
  +++ ApacheModuleSpeling.dsp	1998/04/06 05:21:48	1.4
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.4       +35 -6     apache-1.3/src/os/win32/ApacheModuleSpeling.mak
  
  Index: ApacheModuleSpeling.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleSpeling.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- ApacheModuleSpeling.mak	1998/02/05 12:29:07	1.3
  +++ ApacheModuleSpeling.mak	1998/04/06 05:21:48	1.4
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleSpelingR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleSpeling.pch"\
  + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleSpelingD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -177,16 +177,21 @@
   !IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleSpeling - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_speling.c
  +
  +!IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
  +
   DEP_CPP_MOD_S=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
   	"..\..\include\http_log.h"\
   	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -201,6 +206,30 @@
   "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
  +
  +DEP_CPP_MOD_S=\
  +	"..\..\include\alloc.h"\
  +	"..\..\include\ap.h"\
  +	"..\..\include\buff.h"\
  +	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
  +	"..\..\include\hsregex.h"\
  +	"..\..\include\http_config.h"\
  +	"..\..\include\http_core.h"\
  +	"..\..\include\http_log.h"\
  +	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +
  +"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleStatus.dsp
  
  Index: ApacheModuleStatus.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleStatus.dsp	1998/02/05 12:29:13	1.6
  +++ ApacheModuleStatus.dsp	1998/04/06 05:21:48	1.7
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.11      +7 -6      apache-1.3/src/os/win32/ApacheModuleStatus.mak
  
  Index: ApacheModuleStatus.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- ApacheModuleStatus.mak	1998/03/09 22:43:06	1.10
  +++ ApacheModuleStatus.mak	1998/04/06 05:21:48	1.11
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch"\
  + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -218,6 +218,7 @@
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
  
  
  
  1.7       +2 -2      apache-1.3/src/os/win32/ApacheModuleUserTrack.dsp
  
  Index: ApacheModuleUserTrack.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleUserTrack.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- ApacheModuleUserTrack.dsp	1998/02/05 12:29:13	1.6
  +++ ApacheModuleUserTrack.dsp	1998/04/06 05:21:48	1.7
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +35 -6     apache-1.3/src/os/win32/ApacheModuleUserTrack.mak
  
  Index: ApacheModuleUserTrack.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleUserTrack.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- ApacheModuleUserTrack.mak	1998/02/05 12:29:08	1.9
  +++ ApacheModuleUserTrack.mak	1998/04/06 05:21:49	1.10
  @@ -62,9 +62,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  + "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleUserTrackR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -117,9 +117,10 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\ApacheModuleUserTrackD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -177,15 +178,20 @@
   !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleUserTrack - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_usertrack.c
  +
  +!IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
  +
   DEP_CPP_MOD_U=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\buff.h"\
   	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
   	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -200,6 +206,29 @@
   "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  +
  +!ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
  +
  +DEP_CPP_MOD_U=\
  +	"..\..\include\alloc.h"\
  +	"..\..\include\ap.h"\
  +	"..\..\include\buff.h"\
  +	"..\..\include\conf.h"\
  +	"..\..\include\hide.h"\
  +	"..\..\include\hsregex.h"\
  +	"..\..\include\http_config.h"\
  +	"..\..\include\http_core.h"\
  +	"..\..\include\httpd.h"\
  +	"..\..\include\util_uri.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +
  +"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.14      +5 -3      apache-1.3/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- os.h	1998/02/24 10:30:56	1.13
  +++ os.h	1998/04/06 05:21:49	1.14
  @@ -40,12 +40,14 @@
   every configuration function as __stdcall.
   */
   
  -#define API_EXPORT(type)    __declspec(dllexport) type __stdcall
  -#define API_EXPORT_NONSTD(type)    __declspec(dllexport) type
  -#ifdef IS_MODULE
  +#ifdef SHARED_MODULE
   # define API_VAR_EXPORT		__declspec(dllimport)
  +# define API_EXPORT(type)    __declspec(dllimport) type __stdcall
  +# define API_EXPORT_NONSTD(type)    __declspec(dllimport) type
   #else
   # define API_VAR_EXPORT		__declspec(dllexport)
  +# define API_EXPORT(type)    __declspec(dllexport) type __stdcall
  +# define API_EXPORT_NONSTD(type)    __declspec(dllexport) type
   #endif
   #define MODULE_VAR_EXPORT   __declspec(dllexport)
   
  
  
  

Mime
View raw message