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 29778df2976fdea7cbc8731d7d9a73866b50ede7..f8edde19eb5dccd05b91da852bd4040a98b73293 100755 (executable)
--- 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 239f9f1cda775b69c4ad60836fa6317c5a3a85cc..0397f94d3c11819cb8de215df364da331a72d253 100755 (executable)
--- 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>