diff options
| -rw-r--r-- | Apache.dsw | 3 | ||||
| -rw-r--r-- | ApacheCore.dsp | 3 | ||||
| -rw-r--r-- | ApacheCoreDll.dsp | 4 | ||||
| -rw-r--r-- | httpd.dsp | 3 | ||||
| -rw-r--r-- | libhttpd.dsp | 4 | ||||
| -rw-r--r-- | support/htpasswd.c | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/Apache.dsw b/Apache.dsw index 98305f2972..bf15d44c89 100644 --- 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 7777622b1c..58baac3e8f 100644 --- 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 7ef454ef7b..78c3870603 100644 --- 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 @@ -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 7ef454ef7b..78c3870603 100644 --- 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 90197d11a1..820cf78bf0 100644 --- 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)); |