Merge branch 'phpng' of git.php.net:php-src into phpng

1 files changed, 7 insertions, 2 deletions

diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h
index f559bd18d4..63653213fe 100644
--- a/ext/xmlreader/php_xmlreader.h
+++ b/ext/xmlreader/php_xmlreader.h
@@ -32,15 +32,20 @@ extern zend_module_entry xmlreader_module_entry;
 #include <libxml/xmlreader.h>
 
 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);