From 4e66cce87ce0e57a7394486412e61abcfc5f3520 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 29 Jul 2015 12:26:23 +0200 Subject: switch to the unified globals accessor where appropriate --- ext/libxml/php_libxml.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ext/libxml/php_libxml.h') diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 5a68a57494..6dc9daaeaf 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -115,14 +115,11 @@ PHP_LIBXML_API zend_bool php_libxml_disable_entity_loader(zend_bool disable); PHP_LIBXML_API void php_libxml_initialize(void); PHP_LIBXML_API void php_libxml_shutdown(void); -#ifdef ZTS -#define LIBXML(v) ZEND_TSRMG(libxml_globals_id, zend_libxml_globals *, v) -#ifdef COMPILE_DL_LIBXML +#define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v) + +#if defined(ZTS) && defined(COMPILE_DL_LIBXML) ZEND_TSRMLS_CACHE_EXTERN(); #endif -#else -#define LIBXML(v) (libxml_globals.v) -#endif #else /* HAVE_LIBXML */ #define libxml_module_ptr NULL -- cgit v1.2.1 From 3fc5f5cdb5d22461241b38d0e8cba8ae89b2db71 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sun, 20 Sep 2015 09:30:50 -0700 Subject: Fixed bug #70535 (XSLT: free(): invalid pointer) --- ext/libxml/php_libxml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/libxml/php_libxml.h') diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 6dc9daaeaf..3d61b6b7e8 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -86,7 +86,7 @@ typedef struct _php_libxml_node_object { static inline php_libxml_node_object *php_libxml_node_fetch_object(zend_object *obj) { - return (php_libxml_node_object *)((char*)(obj) - XtOffsetOf(php_libxml_node_object, std)); + return (php_libxml_node_object *)((char*)(obj) - obj->handlers->offset); } #define Z_LIBXML_NODE_P(zv) php_libxml_node_fetch_object(Z_OBJ_P((zv))) -- cgit v1.2.1 From 49493a2dcfb2cd1758b69b13d9006ead3be0e066 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 1 Jan 2016 19:19:27 +0200 Subject: Happy new year (Update copyright to 2016) --- ext/libxml/php_libxml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/libxml/php_libxml.h') diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index d208ad5d2a..98cf726a3d 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 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 | -- cgit v1.2.1 From 1ac152938cfe40e98b7b3c8cf403abb113266cfa Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 3 Mar 2016 16:46:04 +0100 Subject: Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE Also re bug #71575. --- ext/libxml/php_libxml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/libxml/php_libxml.h') diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 345af030b2..11fca74938 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -118,7 +118,7 @@ PHP_LIBXML_API void php_libxml_shutdown(void); #define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v) #if defined(ZTS) && defined(COMPILE_DL_LIBXML) -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #endif #else /* HAVE_LIBXML */ -- cgit v1.2.1