diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 12:22:27 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 12:22:27 +0100 |
| commit | 9d70df24f8a35e7706d629151f43fc0757eb5f58 (patch) | |
| tree | 5fc6230862ebec7648b71fe46a8d1e9bb442bd4a /sapi/phpdbg/phpdbg.h | |
| parent | 24f0d2ed54dbc4d059978d45a8157adaa812ca0c (diff) | |
| parent | 673003757f5c82eb79bdabb913069f1b7b2ad982 (diff) | |
| download | php-git-9d70df24f8a35e7706d629151f43fc0757eb5f58.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
C89 fixes
use portable struct stat
fixed macro va args expansion for vs
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index bcf4981edc..672e75f814 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -71,9 +71,14 @@ #endif #undef zend_hash_str_add +#ifdef PHP_WIN32 +#define zend_hash_str_add(...) \ + _zend_hash_str_add(__VA_ARGS__ ZEND_FILE_LINE_CC) +#else #define zend_hash_str_add_tmp(ht, key, len, pData) \ _zend_hash_str_add(ht, key, len, pData ZEND_FILE_LINE_CC) #define zend_hash_str_add(...) zend_hash_str_add_tmp(__VA_ARGS__) +#endif #ifdef HAVE_LIBREADLINE # include <readline/readline.h> |