diff options
Diffstat (limited to 'ext/xmlreader/php_xmlreader.h')
| -rw-r--r-- | ext/xmlreader/php_xmlreader.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h index 582d2c642f..4e27a7d6f4 100644 --- a/ext/xmlreader/php_xmlreader.h +++ b/ext/xmlreader/php_xmlreader.h @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2016 The PHP Group | + | Copyright (c) 1997-2017 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 | @@ -24,6 +24,9 @@ extern zend_module_entry xmlreader_module_entry; #define phpext_xmlreader_ptr &xmlreader_module_entry +#include "php_version.h" +#define PHP_XMLREADER_VERSION PHP_VERSION + #ifdef ZTS #include "TSRM.h" #endif @@ -31,22 +34,35 @@ extern zend_module_entry xmlreader_module_entry; #include "ext/libxml/php_libxml.h" #include <libxml/xmlreader.h> +/* If xmlreader and dom both are compiled statically, + no DLL import should be used in xmlreader for dom symbols. */ +#ifdef PHP_WIN32 +# if defined(HAVE_DOM) && !defined(COMPILE_DL_DOM) && !defined(COMPILE_DL_XMLREADER) +# define DOM_LOCAL_DEFINES 1 +# endif +#endif + typedef struct _xmlreader_object { - zend_object std; xmlTextReaderPtr ptr; /* strings must be set in input buffer as copy is required */ xmlParserInputBufferPtr input; void *schema; HashTable *prop_handler; - zend_object_handle handle; + zend_object std; } xmlreader_object; +static inline xmlreader_object *php_xmlreader_fetch_object(zend_object *obj) { + return (xmlreader_object *)((char*)(obj) - XtOffsetOf(xmlreader_object, std)); +} + +#define Z_XMLREADER_P(zv) php_xmlreader_fetch_object(Z_OBJ_P((zv))) + PHP_MINIT_FUNCTION(xmlreader); PHP_MSHUTDOWN_FUNCTION(xmlreader); PHP_MINFO_FUNCTION(xmlreader); #define REGISTER_XMLREADER_CLASS_CONST_LONG(const_name, value) \ - zend_declare_class_constant_long(xmlreader_class_entry, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC); + zend_declare_class_constant_long(xmlreader_class_entry, const_name, sizeof(const_name)-1, (zend_long)value); #ifdef ZTS #define XMLREADER_G(v) TSRMG(xmlreader_globals_id, zend_xmlreader_globals *, v) |