From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 11 Sep 2001 03:03:44 +0000 (+0000)
Subject:   Fix two win32 bugaboos.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23dec0444e1ace09b0a4f32ec6c37ffb9303f466;p=thirdparty%2Fapache%2Fhttpd.git

  Fix two win32 bugaboos.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@90996 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/os/win32/os.c b/src/os/win32/os.c
index 29778df2976..f8edde19eb5 100755
--- a/src/os/win32/os.c
+++ b/src/os/win32/os.c
@@ -85,7 +85,7 @@ API_EXPORT(int) os_stat(const char *szPath, struct stat *pStat)
     }
 
     if (szPath[0] == '/' && szPath[1] == '/') {
-	char buf[_MAX_PATH];
+	char buf[MAX_PATH];
 	char *s;
 	int nSlashes = 0;
 
diff --git a/src/os/win32/os.h b/src/os/win32/os.h
index 239f9f1cda7..0397f94d3c1 100755
--- a/src/os/win32/os.h
+++ b/src/os/win32/os.h
@@ -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>