diff options
| author | Anatol Belski <ab@php.net> | 2014-11-06 13:42:24 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-06 13:42:24 +0100 |
| commit | 1b4e9c2713d2e48a77a06cfc656143b482baddfa (patch) | |
| tree | ec16839abf0ab443f52f9ba93293a56020e08fc3 /Zend | |
| parent | 75041379a6e73b22c094c3c9c7878a1c4e439725 (diff) | |
| parent | 6b0eca060f4e4885b4484ef9b16abf984da245d4 (diff) | |
| download | php-git-1b4e9c2713d2e48a77a06cfc656143b482baddfa.tar.gz | |
Merge branch 'pull-request/869'
* pull-request/869:
Various fixes to allow support for new VS2014 features - Added some typeof checks to handle JS errors introduced in VS2014 - Added VS2014 to the list of compilers - Changed to use stdint.h if we are using VS2014 or higher - Skip defining timespec if we're using VS2014 or higher - Moved u_char typedef out to always be defined regardless of VS version
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_config.w32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h index 6ea67602b4..5353064be1 100644 --- a/Zend/zend_config.w32.h +++ b/Zend/zend_config.w32.h @@ -47,7 +47,9 @@ typedef unsigned int uint; #define HAVE_CLASS_ISTDIOSTREAM #define istdiostream stdiostream +#if _MSC_VER < 1900 #define snprintf _snprintf +#endif #if _MSC_VER < 1500 #define vsnprintf _vsnprintf #endif |