diff options
| author | Anatol Belski <ab@php.net> | 2014-01-20 10:13:22 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-20 10:13:22 +0100 |
| commit | 89a9acea1f9d821a9805b3857bf4febbba08690d (patch) | |
| tree | 8d3208028aa966937dde6d3cc257d4089d624d05 | |
| parent | d501707248544c585ecd351d7512cde5982790c4 (diff) | |
| parent | 8dd44fee0891d8d73163edd1be7d13880736ae58 (diff) | |
| download | php-git-89a9acea1f9d821a9805b3857bf4febbba08690d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed glob compilation with vc12
| -rw-r--r-- | win32/glob.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/win32/glob.c b/win32/glob.c index 1aeac78fda..8111daba1c 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 |