Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  C89 fixes
  use portable struct stat
  fixed macro va args expansion for vs

Author: weltling

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>

sapi/phpdbg/phpdbg_info.c

@@ -386,8 +386,9 @@ PHPDBG_INFO(classes) /* {{{ */
 		phpdbg_print_class_name(ce);
 
 		if (ce->parent) {
+			zend_class_entry *pce;
 			phpdbg_xml("<parents %r>");
-			zend_class_entry *pce = ce->parent;
+			pce = ce->parent;
 			do {
 				phpdbg_out("|-------- ");
 				phpdbg_print_class_name(pce);

sapi/phpdbg/phpdbg_prompt.c

@@ -306,7 +306,7 @@ void phpdbg_string_init(char *buffer) {
 
 void phpdbg_try_file_init(char *init_file, size_t init_file_len, zend_bool free_init) /* {{{ */
 {
-	struct stat sb;
+	zend_stat_t sb;
 
 	if (init_file && VCWD_STAT(init_file, &sb) != -1) {
 		FILE *fp = fopen(init_file, "r");
@@ -374,7 +374,7 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default) /
 
 PHPDBG_COMMAND(exec) /* {{{ */
 {
-	struct stat sb;
+	zend_stat_t sb;
 
 	if (VCWD_STAT(param->str, &sb) != FAILURE) {
 		if (sb.st_mode & (S_IFREG|S_IFLNK)) {
@@ -698,10 +698,11 @@ PHPDBG_COMMAND(ev) /* {{{ */
 	zend_execute_data *original_execute_data = EG(current_execute_data);
 	zend_class_entry *original_scope = EG(scope);
 	zend_vm_stack original_stack = EG(vm_stack);
-	original_stack->top = EG(vm_stack_top);
 
 	PHPDBG_OUTPUT_BACKUP();
 
+	original_stack->top = EG(vm_stack_top);
+
 	if (PHPDBG_G(flags) & PHPDBG_IN_SIGNAL_HANDLER) {
 		phpdbg_try_access {
 			phpdbg_parse_variable(param->str, param->len, &EG(symbol_table).ht, 0, phpdbg_output_ev_variable, 0);
@@ -1072,7 +1073,7 @@ PHPDBG_COMMAND(dl) /* {{{ */
 
 PHPDBG_COMMAND(source) /* {{{ */
 {
-	struct stat sb;
+	zend_stat_t sb;
 
 	if (VCWD_STAT(param->str, &sb) != -1) {
 		phpdbg_try_file_init(param->str, param->len, 0);