httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/os/win32 os.h os.c
Date Tue, 11 Sep 2001 03:03:44 GMT
wrowe       01/09/10 20:03:44

  Modified:    src/os/win32 os.h os.c
  Log:
    Fix two win32 bugaboos.
  
  Revision  Changes    Path
  1.42      +8 -0      apache-1.3/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- os.h	2001/05/10 14:54:54	1.41
  +++ os.h	2001/09/11 03:03:44	1.42
  @@ -69,9 +69,17 @@
    */
   #define _WIN32_WINNT 0x0400
   
  +/* If it isn't too late, prevent windows.h from including the original
  + * winsock.h header, so that we can still include winsock2.h
  + */
  +#if !defined(_WINSOCKAPI_) || !defined(_WINDOWS_)
  +#define _WINSOCKAPI_
   #include <windows.h>
   #include <winsock2.h>
   #include <mswsock.h>
  +#else
  +#include <windows.h>
  +#endif
   #include <process.h>
   #include <malloc.h>
   #include <io.h>
  
  
  
  1.6       +1 -1      apache-1.3/src/os/win32/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/os.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- os.c	2001/03/28 23:17:36	1.5
  +++ os.c	2001/09/11 03:03:44	1.6
  @@ -85,7 +85,7 @@
       }
   
       if (szPath[0] == '/' && szPath[1] == '/') {
  -	char buf[_MAX_PATH];
  +	char buf[MAX_PATH];
   	char *s;
   	int nSlashes = 0;
   
  
  
  

Mime
View raw message