httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/support htpasswd.c
Date Mon, 16 Oct 2000 13:50:49 GMT
wrowe       00/10/16 06:50:44

  Modified:    src      Apache.dsw ApacheCore.dsp ApacheCoreDll.dsp
               src/lib/apr aprlib.dsp
               src/support htpasswd.c
  Log:
    Fix compile break in Win32
  
  Revision  Changes    Path
  1.27      +0 -3      apache-2.0/src/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.dsw,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Apache.dsw	2000/10/15 22:49:48	1.26
  +++ Apache.dsw	2000/10/16 13:50:25	1.27
  @@ -35,9 +35,6 @@
       Begin Project Dependency
       Project_Dep_Name gen_uri_delims
       End Project Dependency
  -    Begin Project Dependency
  -    Project_Dep_Name aprlibdll
  -    End Project Dependency
   }}}
   
   ###############################################################################
  
  
  
  1.42      +2 -1      apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ApacheCore.dsp	2000/10/16 06:38:42	1.41
  +++ ApacheCore.dsp	2000/10/16 13:50:26	1.42
  @@ -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 @@
   !MESSAGE 
   
   # Begin Project
  +# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  
  
  
  1.4       +2 -2      apache-2.0/src/ApacheCoreDll.dsp
  
  Index: ApacheCoreDll.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCoreDll.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheCoreDll.dsp	2000/10/16 06:04:27	1.3
  +++ ApacheCoreDll.dsp	2000/10/16 13:50:28	1.4
  @@ -68,8 +68,8 @@
   # 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.41      +2 -1      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- aprlib.dsp	2000/10/16 06:22:24	1.40
  +++ aprlib.dsp	2000/10/16 13:50:34	1.41
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="aprlib" - 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 @@
   !MESSAGE 
   
   # Begin Project
  +# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  
  
  
  1.23      +2 -0      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- htpasswd.c	2000/10/06 17:52:46	1.22
  +++ htpasswd.c	2000/10/16 13:50:40	1.23
  @@ -233,6 +233,7 @@
   	apr_cpystrn(cpw,pw,sizeof(cpw));
   	break;
   
  +#ifndef WIN32
       case ALG_CRYPT:
       default:
           (void) srand((int) time((time_t *) NULL));
  @@ -241,6 +242,7 @@
   
   	apr_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1);
   	break;
  +#endif
       }
       memset(pw, '\0', strlen(pw));
   
  
  
  

Mime
View raw message