Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 26426 invoked by uid 500); 11 Sep 2001 03:07:42 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 26414 invoked by uid 500); 11 Sep 2001 03:07:42 -0000 Delivered-To: apmail-apache-1.3-cvs@apache.org Date: 11 Sep 2001 03:03:44 -0000 Message-ID: <20010911030344.73988.qmail@icarus.apache.org> From: wrowe@apache.org To: apache-1.3-cvs@apache.org Subject: cvs commit: apache-1.3/src/os/win32 os.h os.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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 #include #include +#else +#include +#endif #include #include #include 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;