Fix compile break in Win32

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86611 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index 98305f2972ffb37389dc8e46519b25d3bdd44d28..bf15d44c89f5d944422e2cc45b395c76a9f74622 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -35,9 +35,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name gen_uri_delims
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/ApacheCore.dsp b/ApacheCore.dsp
index 7777622b1cab1af428bdaca9b14219d0b708cf33..58baac3e8f0d9a78f546341f9afdd5541b667376 100644 (file)
--- a/ApacheCore.dsp
+++ b/ApacheCore.dsp
@@ -1,5 +1,5 @@
 # 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 **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@@ -22,6 +22,7 @@ CFG=ApacheCore - Win32 Debug
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe

diff --git a/ApacheCoreDll.dsp b/ApacheCoreDll.dsp
index 7ef454ef7b470271ed96f101c1142cfc5175ac4c..78c3870603359756694a266577a88d425dad2106 100644 (file)
--- a/ApacheCoreDll.dsp
+++ b/ApacheCoreDll.dsp
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\CoreD"
 # PROP Ignore_Export_Lib 0
 # 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 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 /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
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

diff --git a/httpd.dsp b/httpd.dsp
index 7777622b1cab1af428bdaca9b14219d0b708cf33..58baac3e8f0d9a78f546341f9afdd5541b667376 100644 (file)
--- a/httpd.dsp
+++ b/httpd.dsp
@@ -1,5 +1,5 @@
 # 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 **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@@ -22,6 +22,7 @@ CFG=ApacheCore - Win32 Debug
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe

diff --git a/libhttpd.dsp b/libhttpd.dsp
index 7ef454ef7b470271ed96f101c1142cfc5175ac4c..78c3870603359756694a266577a88d425dad2106 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\CoreD"
 # PROP Ignore_Export_Lib 0
 # 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 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 /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
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

diff --git a/support/htpasswd.c b/support/htpasswd.c
index 90197d11a1085f8816defb83d215b14ba23359cc..820cf78bf0e2f2e6cb2a1e370eb87113cb01a85b 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -233,6 +233,7 @@ static int mkrecord(char *user, char *record, size_t rlen, char *passwd,
        apr_cpystrn(cpw,pw,sizeof(cpw));
        break;
 
+#ifndef WIN32
     case ALG_CRYPT:
     default:
         (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);
        break;
+#endif
     }
     memset(pw, '\0', strlen(pw));