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

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

diff --cc sapi/phpdbg/phpdbg.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_info.c
index a148a84b457095084fe1a9647d38ce491eff515e,7963ff35e260c03f11bf8d56cd72f96565b43f4d..2c52b4568675905ed9a1d3cd3b5c3aa23f5acd07
--- 1/sapi/phpdbg/phpdbg_info.c
--- 2/sapi/phpdbg/phpdbg_info.c
+++ b/sapi/phpdbg/phpdbg_info.c
@@@ -383,14 -383,15 +383,15 @@@ PHPDBG_INFO(classes) /* {{{ *
  
        /* once added, assume that classes are stable... until shutdown. */
        ZEND_HASH_FOREACH_PTR(&classes, ce) {
 -              phpdbg_print_class_name(ce TSRMLS_CC);
 +              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 TSRMLS_CC);
 +                              phpdbg_print_class_name(pce);
                        } while ((pce = pce->parent));
                        phpdbg_xml("</parents>");
                }

diff --cc sapi/phpdbg/phpdbg_prompt.c
index 6de08e038ebd0ffabf36d9972c8edc1e6f37f90f,0ab5b4d2303cf341068069481f970d3a0a42a833..b49049969e4682fd85a24182dccd0a1abce3b503
--- 1/sapi/phpdbg/phpdbg_prompt.c
--- 2/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@@ -304,9 -304,9 +304,9 @@@ void phpdbg_string_init(char *buffer) 
        }
  }
  
 -void phpdbg_try_file_init(char *init_file, size_t init_file_len, zend_bool free_init TSRMLS_DC) /* {{{ */
 +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");
@@@ -701,10 -701,11 +701,11 @@@ PHPDBG_COMMAND(ev) /* {{{ *
  
        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 TSRMLS_CC);
 +                      phpdbg_parse_variable(param->str, param->len, &EG(symbol_table).ht, 0, phpdbg_output_ev_variable, 0);
                } phpdbg_catch_access {
                        phpdbg_error("signalsegv", "", "Could not fetch data, invalid data source");
                } phpdbg_end_try_access();
@@@ -1072,10 -1073,10 +1073,10 @@@ 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 TSRMLS_CC);
 +              phpdbg_try_file_init(param->str, param->len, 0);
        } else {
                phpdbg_error("source", "type=\"notfound\" file=\"%s\"", "Failed to stat %s, file does not exist", param->str);
        }