Revert "Rename _zval_dtor_func to _ref_dtor_func"

This reverts commit a362ae6b12.

ext/json/json_parser.tab.h

@@ -1,21 +1,19 @@
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -28,27 +26,35 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+#ifndef YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED
+# define YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int php_json_yydebug;
+#endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     PHP_JSON_T_NUL = 258,
-     PHP_JSON_T_TRUE = 259,
-     PHP_JSON_T_FALSE = 260,
-     PHP_JSON_T_INT = 261,
-     PHP_JSON_T_DOUBLE = 262,
-     PHP_JSON_T_STRING = 263,
-     PHP_JSON_T_ESTRING = 264,
-     PHP_JSON_T_EOI = 265,
-     PHP_JSON_T_ERROR = 266
-   };
+  enum yytokentype
+  {
+    PHP_JSON_T_NUL = 258,
+    PHP_JSON_T_TRUE = 259,
+    PHP_JSON_T_FALSE = 260,
+    PHP_JSON_T_INT = 261,
+    PHP_JSON_T_DOUBLE = 262,
+    PHP_JSON_T_STRING = 263,
+    PHP_JSON_T_ESTRING = 264,
+    PHP_JSON_T_EOI = 265,
+    PHP_JSON_T_ERROR = 266
+  };
 #endif
 /* Tokens.  */
 #define PHP_JSON_T_NUL 258
@@ -61,11 +67,10 @@
 #define PHP_JSON_T_EOI 265
 #define PHP_JSON_T_ERROR 266
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+
+union YYSTYPE
 {
 
 
@@ -76,13 +81,15 @@ typedef union YYSTYPE
 	} pair;
 
 
+};
 
-} YYSTYPE;
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
+int php_json_yyparse (php_json_parser *parser);
 
+#endif /* !YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED  */

ext/soap/php_packet_soap.c

@@ -385,7 +385,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction
 			} else {
 				zend_refcounted *garbage = Z_COUNTED_P(return_value);
 				ZVAL_COPY(return_value, tmp);
-				ref_dtor_func(garbage);
+				zval_dtor_func(garbage);
 			}
 		}
 	}

ext/standard/var_unserializer.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 */
+/* Generated by re2c 1.0.1 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+