1 files changed, 5 insertions, 119 deletions

diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index a4bdef8548..f8bb415f32 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2018 The PHP Group                                |
+   | Copyright (c) The PHP Group                                          |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -22,137 +22,23 @@
 #define PHP_XML_H
 
 #ifdef HAVE_XML
+
 extern zend_module_entry xml_module_entry;
 #define xml_module_ptr &xml_module_entry
 
 #include "php_version.h"
 #define PHP_XML_VERSION PHP_VERSION
 
-#else
-#define xml_module_ptr NULL
-#endif
-
-#ifdef HAVE_XML
-
 #include "expat_compat.h"
 
 #ifdef XML_UNICODE
 #error "UTF-16 Unicode support not implemented!"
 #endif
 
-ZEND_BEGIN_MODULE_GLOBALS(xml)
-	XML_Char *default_encoding;
-ZEND_END_MODULE_GLOBALS(xml)
-
-typedef struct {
-	int case_folding;
-	XML_Parser parser;
-	XML_Char *target_encoding;
-
-	zval index;
-	zval startElementHandler;
-	zval endElementHandler;
-	zval characterDataHandler;
-	zval processingInstructionHandler;
-	zval defaultHandler;
-	zval unparsedEntityDeclHandler;
-	zval notationDeclHandler;
-	zval externalEntityRefHandler;
-	zval unknownEncodingHandler;
-	zval startNamespaceDeclHandler;
-	zval endNamespaceDeclHandler;
-
-	zend_function *startElementPtr;
-	zend_function *endElementPtr;
-	zend_function *characterDataPtr;
-	zend_function *processingInstructionPtr;
-	zend_function *defaultPtr;
-	zend_function *unparsedEntityDeclPtr;
-	zend_function *notationDeclPtr;
-	zend_function *externalEntityRefPtr;
-	zend_function *unknownEncodingPtr;
-	zend_function *startNamespaceDeclPtr;
-	zend_function *endNamespaceDeclPtr;
-
-	zval object;
-
-	zval data;
-	zval info;
-	int level;
-	int toffset;
-	int curtag;
-	zval *ctag;
-	char **ltags;
-	int lastwasopen;
-	int skipwhite;
-	int isparsing;
-
-	XML_Char *baseURI;
-} xml_parser;
-
-
-typedef struct {
-	XML_Char *name;
-	char (*decoding_function)(unsigned short);
-	unsigned short (*encoding_function)(unsigned char);
-} xml_encoding;
-
-
-enum php_xml_option {
-    PHP_XML_OPTION_CASE_FOLDING = 1,
-    PHP_XML_OPTION_TARGET_ENCODING,
-    PHP_XML_OPTION_SKIP_TAGSTART,
-    PHP_XML_OPTION_SKIP_WHITE
-};
-
-/* for xml_parse_into_struct */
-
-#define XML_MAXLEVEL 255 /* XXX this should be dynamic */
-
-PHP_FUNCTION(xml_parser_create);
-PHP_FUNCTION(xml_parser_create_ns);
-PHP_FUNCTION(xml_set_object);
-PHP_FUNCTION(xml_set_element_handler);
-PHP_FUNCTION(xml_set_character_data_handler);
-PHP_FUNCTION(xml_set_processing_instruction_handler);
-PHP_FUNCTION(xml_set_default_handler);
-PHP_FUNCTION(xml_set_unparsed_entity_decl_handler);
-PHP_FUNCTION(xml_set_notation_decl_handler);
-PHP_FUNCTION(xml_set_external_entity_ref_handler);
-PHP_FUNCTION(xml_set_start_namespace_decl_handler);
-PHP_FUNCTION(xml_set_end_namespace_decl_handler);
-PHP_FUNCTION(xml_parse);
-PHP_FUNCTION(xml_get_error_code);
-PHP_FUNCTION(xml_error_string);
-PHP_FUNCTION(xml_get_current_line_number);
-PHP_FUNCTION(xml_get_current_column_number);
-PHP_FUNCTION(xml_get_current_byte_index);
-PHP_FUNCTION(xml_parser_free);
-PHP_FUNCTION(xml_parser_set_option);
-PHP_FUNCTION(xml_parser_get_option);
-PHP_FUNCTION(utf8_encode);
-PHP_FUNCTION(utf8_decode);
-PHP_FUNCTION(xml_parse_into_struct);
-
-PHP_XML_API char *_xml_zval_strdup(zval *);
-PHP_XML_API zend_string *xml_utf8_decode(const XML_Char *, size_t, const XML_Char *);
-PHP_XML_API zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *);
-
-#endif /* HAVE_LIBEXPAT */
+#else
+#define xml_module_ptr NULL
+#endif /* HAVE_XML */
 
 #define phpext_xml_ptr xml_module_ptr
 
-#define XML(v) ZEND_MODULE_GLOBALS_ACCESSOR(xml, v)
-
-#if defined(ZTS) && defined(COMPILE_DL_XML)
-ZEND_TSRMLS_CACHE_EXTERN()
-#endif
-
 #endif /* PHP_XML_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */