VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-25 16:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile break in Win32

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86611 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2000-10-16 13:50:40 +00:00
parent 32a8423ba2
commit a37d06254f
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Apache.dsw
View File

@ -35,9 +35,6 @@ Package=<4>
Begin Project Dependency Begin Project Dependency
Project_Dep_Name gen_uri_delims Project_Dep_Name gen_uri_delims
End Project Dependency End Project Dependency
Begin Project Dependency
Project_Dep_Name aprlibdll
End Project Dependency
}}} }}}
############################################################################### ###############################################################################

3
ApacheCore.dsp
View File

@ -1,5 +1,5 @@
# Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 5.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@ -22,6 +22,7 @@ CFG=ApacheCore - Win32 Debug
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe

4
ApacheCoreDll.dsp
View File

@ -68,8 +68,8 @@ LINK32=link.exe
# PROP Intermediate_Dir ".\CoreD" # PROP Intermediate_Dir ".\CoreD"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD BASE CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c
# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

3
httpd.dsp
View File

@ -1,5 +1,5 @@
# Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="ApacheCore" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 5.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@ -22,6 +22,7 @@ CFG=ApacheCore - Win32 Debug
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe

4
libhttpd.dsp
View File

@ -68,8 +68,8 @@ LINK32=link.exe
# PROP Intermediate_Dir ".\CoreD" # PROP Intermediate_Dir ".\CoreD"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD BASE CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c
# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c # ADD CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

2
support/htpasswd.c
View File

@ -233,6 +233,7 @@ static int mkrecord(char *user, char *record, size_t rlen, char *passwd,
apr_cpystrn(cpw,pw,sizeof(cpw)); apr_cpystrn(cpw,pw,sizeof(cpw));
break; break;
#ifndef WIN32
case ALG_CRYPT: case ALG_CRYPT:
default: default:
(void) srand((int) time((time_t *) NULL)); (void) srand((int) time((time_t *) NULL));
@ -241,6 +242,7 @@ static int mkrecord(char *user, char *record, size_t rlen, char *passwd,
apr_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1); apr_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1);
break; break;
#endif
} }
memset(pw, '\0', strlen(pw)); memset(pw, '\0', strlen(pw));