com php-src: backported the VC12 fix for ARG_MAX: win3 2/glob.c
| From: | Anatol Belski | Date: | Wed, 02 Jul 2014 09:11:39 +0000 |
| Subject: | com php-src: backported the VC12 fix for ARG_MAX: win3 2/glob.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79187@lists.php.net to get a copy of this message | ||
Commit: 49e175be422191c114f3d9a18f0e3b9c5927452e
Author: Anatol Belski <ab@php.net> Wed, 2 Jul 2014 11:11:39 +0200
Parents: 1e06c73192c64ecc601ad265ed5666e90048c4b4
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=49e175be422191c114f3d9a18f0e3b9c5927452e
Log:
backported the VC12 fix for ARG_MAX
Changed paths:
M win32/glob.c
Diff:
diff --git a/win32/glob.c b/win32/glob.c
index 1aeac78..8111dab 100644
--- a/win32/glob.c
+++ b/win32/glob.c
@@ -61,9 +61,16 @@
* Number of matches in the current invocation of glob.
*/
#ifdef PHP_WIN32
-#define _POSIX_
-#include <limits.h>
-#undef _POSIX_
+#if _MSC_VER < 1800
+# define _POSIX_
+# include <limits.h>
+# undef _POSIX_
+#else
+/* Visual Studio 2013 removed all the _POSIX_ defines, but we depend on some */
+# ifndef ARG_MAX
+# define ARG_MAX 14500
+# endif
+#endif
#ifndef S_ISDIR
#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR)
#endif