diff --git a/src/base/util.h b/src/base/util.h
index 2d9f1db..150d924 100644
--- a/src/base/util.h
+++ b/src/base/util.h
@@ -52,7 +52,7 @@
   void operator=(const TypeName&)
 
 // Starting with Visual C++ 2005, WinNT.h includes ARRAYSIZE.
-#if !defined(_MSC_VER) || _MSC_VER < 1400
+#ifndef ARRAYSIZE
 #define ARRAYSIZE(a) \
   ((sizeof(a) / sizeof(*(a))) / \
    static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
diff --git a/src/windows/port.h b/src/windows/port.h
index 7edc6f0..3b17b43 100644
--- a/src/windows/port.h
+++ b/src/windows/port.h
@@ -69,7 +69,10 @@
 #endif
 
 /* file I/O */
-#define PATH_MAX 1024
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 #define access  _access
 #define getcwd  _getcwd
 #define open    _open