com php-src: fixed macro va args expansion for vs: sapi/phpdbg/phpdbg.h
| From: | Anatol Belski | Date: | Tue, 16 Dec 2014 11:20:57 +0000 |
| Subject: | com php-src: fixed macro va args expansion for vs: sapi/phpdbg/phpdbg.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83737@lists.php.net to get a copy of this message | ||
Commit: f1d1185c64e73ae19d7339cfe5e0e0f92da0e4f0
Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 11:45:02 +0100
Parents: 53c8b180c8efaab3edf7a02d39ca4e9628e1f67b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1d1185c64e73ae19d7339cfe5e0e0f92da0e4f0
Log:
fixed macro va args expansion for vs
Changed paths:
M sapi/phpdbg/phpdbg.h
Diff:
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index 60d1239..a6d4935 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>