diff options
| author | Thies C. Arntzen <thies@php.net> | 2001-05-11 17:57:37 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 2001-05-11 17:57:37 +0000 |
| commit | cd2f057f1a5bac5ec724c2602b2c18899fe7a7fa (patch) | |
| tree | 4c03ea5a142ce17aae80e375ac2d78e577896448 /ext/xml/php_xml.h | |
| parent | 814fa2c71ca92d23ab515e9d6873631dfcf44ae1 (diff) | |
| download | php-git-cd2f057f1a5bac5ec724c2602b2c18899fe7a7fa.tar.gz | |
bump bundled expat to 1.95.1
win32 project _needs_ updating and i don't have windows
Diffstat (limited to 'ext/xml/php_xml.h')
| -rw-r--r-- | ext/xml/php_xml.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 6738aeb9b6..ed2f709793 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -33,14 +33,9 @@ extern zend_module_entry xml_module_entry; #endif -#if defined(HAVE_LIBEXPAT) && defined(PHP_XML_INTERNAL) +#if defined(PHP_XML_INTERNAL) -#ifdef HAVE_LIBEXPAT2 #include <expat.h> -#else -#include <xmltok.h> -#include <xmlparse.h> -#endif #ifdef PHP_WIN32 #define PHP_XML_API __declspec(dllexport) @@ -71,10 +66,8 @@ typedef struct { zval *notationDeclHandler; zval *externalEntityRefHandler; zval *unknownEncodingHandler; -#ifdef HAVE_LIBEXPAT2 zval *startNamespaceDeclHandler; zval *endNamespaceDeclHandler; -#endif zval *object; zval *data; @@ -114,9 +107,7 @@ enum php_xml_option { #define XML_MAXLEVEL 255 /* XXX this should be dynamic */ PHP_FUNCTION(xml_parser_create); -#ifdef HAVE_LIBEXPAT2 PHP_FUNCTION(xml_parser_create_ns); -#endif PHP_FUNCTION(xml_set_object); PHP_FUNCTION(xml_set_element_handler); PHP_FUNCTION(xml_set_character_data_handler); @@ -125,10 +116,8 @@ 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); -#ifdef HAVE_LIBEXPAT2 PHP_FUNCTION(xml_set_start_namespace_decl_handler); PHP_FUNCTION(xml_set_end_namespace_decl_handler); -#endif PHP_FUNCTION(xml_parse); PHP_FUNCTION(xml_get_error_code); PHP_FUNCTION(xml_error_string); |