httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/support htdigest.dsp htpasswd.c htpasswd.dsp logresolve.c rotatelogs.dsp
Date Tue, 25 Apr 2000 21:18:04 GMT
stoddard    00/04/25 14:18:04

  Modified:    src      Apache.dsw
               src/lib/apr aprlib.dsp aprlibdll.dsp
               src/lib/apr/include apr.hw
               src/modules/standard mod_auth_digest.c
               src/os/win32 ApacheModuleAuthDigest.dsp
               src/os/win32/installer/installdll install.dsp install.mak
               src/support htdigest.dsp htpasswd.c htpasswd.dsp
                        logresolve.c rotatelogs.dsp
  Log:
  Some Windows tweaks from William Rowe...
  
  Submitted by:	William Rowe
  
  Revision  Changes    Path
  1.5       +15 -0     apache-2.0/src/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.dsw,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Apache.dsw	2000/04/23 17:42:20	1.4
  +++ Apache.dsw	2000/04/25 21:18:01	1.5
  @@ -74,6 +74,12 @@
   
   Package=<4>
   {{{
  +    Begin Project Dependency
  +    Project_Dep_Name ApacheCore
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name aprlibdll
  +    End Project Dependency
   }}}
   
   ###############################################################################
  @@ -302,6 +308,12 @@
       Begin Project Dependency
       Project_Dep_Name ApacheModuleAuthDigest
       End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name htdigest
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name logresolve
  +    End Project Dependency
   }}}
   
   ###############################################################################
  @@ -428,6 +440,9 @@
   
   Package=<4>
   {{{
  +    Begin Project Dependency
  +    Project_Dep_Name aprlib
  +    End Project Dependency
   }}}
   
   ###############################################################################
  
  
  
  1.23      +22 -6     apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- aprlib.dsp	2000/04/24 14:34:00	1.22
  +++ aprlib.dsp	2000/04/25 21:18:01	1.23
  @@ -39,7 +39,7 @@
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32"
/I "./time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32"
/I "./time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
  @@ -62,7 +62,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
/FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32"
/I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32"
/I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
  @@ -150,10 +150,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\file_io\win32\fileio.h
  -# End Source File
  -# Begin Source File
  -
   SOURCE=.\file_io\win32\filestat.c
   # End Source File
   # Begin Source File
  @@ -242,6 +238,10 @@
   # PROP Default_Filter ".h"
   # Begin Source File
   
  +SOURCE=.\include\apr_dso.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\include\apr_errno.h
   # End Source File
   # Begin Source File
  @@ -258,6 +258,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\include\apr_getopt.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\include\apr_lib.h
   # End Source File
   # Begin Source File
  @@ -278,6 +282,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\include\apr_pools.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\include\apr_portable.h
   # End Source File
   # Begin Source File
  @@ -290,6 +298,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\include\apr_strnatcmp.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\include\apr_thread_proc.h
   # End Source File
   # Begin Source File
  @@ -303,6 +315,10 @@
   # Begin Source File
   
   SOURCE=.\dso\win32\dso.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\file_io\win32\fileio.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/aprlibdll.dsp
  
  Index: aprlibdll.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlibdll.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- aprlibdll.dsp	2000/04/21 16:45:26	1.2
  +++ aprlibdll.dsp	2000/04/25 21:18:01	1.3
  @@ -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 /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32"
/I "./time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32"
/I "./time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  @@ -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
/FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32"
/I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32"
/I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  
  
  
  1.6       +1 -0      apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr.hw	2000/04/20 02:03:11	1.5
  +++ apr.hw	2000/04/25 21:18:02	1.6
  @@ -80,6 +80,7 @@
   #include <time.h>
   #include <process.h>
   #include <signal.h>
  +#include <stdlib.h>
   
   #define ap_inline
   #define __attribute__(__x)
  
  
  
  1.12      +1 -0      apache-2.0/src/modules/standard/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_auth_digest.c	2000/04/21 22:12:41	1.11
  +++ mod_auth_digest.c	2000/04/25 21:18:02	1.12
  @@ -94,6 +94,7 @@
   #include "http_request.h"
   #include "http_log.h"
   #include "http_protocol.h"
  +#include "ap.h"
   #include "ap_ctype.h"
   #include "util_uri.h"
   #include "util_md5.h"
  
  
  
  1.3       +2 -2      apache-2.0/src/os/win32/ApacheModuleAuthDigest.dsp
  
  Index: ApacheModuleAuthDigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleAuthDigest.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleAuthDigest.dsp	2000/04/22 15:44:57	1.2
  +++ ApacheModuleAuthDigest.dsp	2000/04/25 21:18:03	1.3
  @@ -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 /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -72,7 +72,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
/FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include"
/D "_DEBUG" /D "SHARED_MODULE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include"
/D "_DEBUG" /D "SHARED_MODULE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.4       +2 -2      apache-2.0/src/os/win32/installer/installdll/install.dsp
  
  Index: install.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- install.dsp	2000/04/22 15:44:58	1.3
  +++ install.dsp	2000/04/25 21:18:03	1.4
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  @@ -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
/FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D "WIN32"
/D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D "WIN32"
/D "_DEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  
  
  
  1.7       +3 -5      apache-2.0/src/os/win32/installer/installdll/install.mak
  
  Index: install.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.mak,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- install.mak	2000/04/22 15:44:59	1.6
  +++ install.mak	2000/04/25 21:18:03	1.7
  @@ -60,7 +60,7 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D\
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D\
    "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  @@ -154,7 +154,7 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D\
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D\
    "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  @@ -225,12 +225,10 @@
   	"..\..\..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\..\..\lib\apr\include\apr_general.h"\
   	"..\..\..\..\lib\apr\include\apr_lib.h"\
  +	"..\..\..\..\lib\apr\include\apr_private.h"\
   	"..\..\..\..\lib\apr\include\apr_thread_proc.h"\
   	"..\..\..\..\lib\apr\include\apr_time.h"\
   	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_INSTA=\
  -	".\apr_config.h"\
   	
   
   "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
  
  
  
  1.3       +4 -16     apache-2.0/src/support/htdigest.dsp
  
  Index: htdigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- htdigest.dsp	2000/03/21 23:26:49	1.2
  +++ htdigest.dsp	2000/04/25 21:18:03	1.3
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"
/FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -51,7 +51,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
/out:"release/htdigest.exe"
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/machine:I386 /out:"release/htdigest.exe"
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  @@ -68,7 +68,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE"
/D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib\apr\include" /D "WIN32" /D "_DEBUG"
/D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  @@ -77,7 +77,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug
/machine:I386 /out:"debug/htdigest.exe" /pdbtype:sept
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /debug /machine:I386 /out:"debug/htdigest.exe" /pdbtype:sept
   
   !ENDIF 
   
  @@ -85,18 +85,6 @@
   
   # Name "htdigest - Win32 Release"
   # Name "htdigest - Win32 Debug"
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_cpystrn.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_getpass.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\ap\ap_md5c.c
  -# End Source File
   # Begin Source File
   
   SOURCE=.\htdigest.c
  
  
  
  1.8       +2 -3      apache-2.0/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- htpasswd.c	2000/04/24 14:14:02	1.7
  +++ htpasswd.c	2000/04/25 21:18:03	1.8
  @@ -80,13 +80,12 @@
    */
   
   #include "apr_lib.h"
  +#include "apr_errno.h"
   #include "ap_config.h"
  -#include <sys/types.h>
  -#include <signal.h>
  -#include <errno.h>
   #include "ap.h"
   #include "apr_md5.h"
   #include "ap_sha1.h"
  +#include <signal.h>
   
   #ifdef WIN32
   #include <conio.h>
  
  
  
  1.4       +2 -2      apache-2.0/src/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- htpasswd.dsp	2000/03/22 15:21:57	1.3
  +++ htpasswd.dsp	2000/04/25 21:18:04	1.4
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D "NDEBUG" /D "WIN32"
/D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D "NDEBUG" /D
"WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /D "_DEBUG"
/D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /D "_DEBUG"
/D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.5       +14 -5     apache-2.0/src/support/logresolve.c
  
  Index: logresolve.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/logresolve.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- logresolve.c	1999/10/20 23:11:48	1.4
  +++ logresolve.c	2000/04/25 21:18:04	1.5
  @@ -39,12 +39,10 @@
    * that one of these matches the original address.
    */
   
  -#include "ap_config.h"
  -#include <sys/types.h>
  -
  +#include "apr.h"
   #include <ctype.h>
   
  -#if !defined(MPE) && !defined(BEOS) 
  +#if !defined(MPE) && !defined(BEOS) && !defined(WIN32)
   #include <arpa/inet.h>
   #endif
   
  @@ -279,6 +277,14 @@
       char *bar, hoststring[MAXDNAME + 1], line[MAXLINE], *statfile;
       int i, check;
   
  +#ifdef WIN32
  +    /*  If we apr'ify this code, ap_create_pool/ap_destroy_pool
  +     *  should perform the WSAStartup/WSACleanup for us. 
  +     */
  +    WSADATA wsaData;
  +    WSAStartup(0x101, &wsaData);
  +#endif
  +
       check = 0;
       statfile = NULL;
       for (i = 1; i < argc; i++) {
  @@ -298,7 +304,6 @@
   	}
       }
   
  -
       for (i = 0; i < BUCKETS; i++)
   	nscache[i] = NULL;
       for (i = 0; i < MAX_ERR + 2; i++)
  @@ -333,6 +338,10 @@
   	else
   	    puts(hoststring);
       }
  +
  +#ifdef WIN32
  +     WSACleanup();
  +#endif
   
       if (statfile != NULL) {
   	FILE *fp;
  
  
  
  1.3       +2 -2      apache-2.0/src/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- rotatelogs.dsp	2000/03/21 23:26:50	1.2
  +++ rotatelogs.dsp	2000/04/25 21:18:04	1.3
  @@ -42,7 +42,7 @@
   # PROP Intermediate_Dir "Release"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG"
/D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D
"NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -66,7 +66,7 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32"
/D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32"
/D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  

Mime
View raw message