From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- 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 b79ca17556..b06462db28 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1 From e33f3d3b7c9a69fe069484045a27d282aa98b00e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 20 Sep 2014 22:42:02 +0200 Subject: Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h. --- 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 b06462db28..9518654b5b 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -34,7 +34,7 @@ extern zend_module_entry libxml_module_entry; # define PHP_LIBXML_API #endif -#include "ext/standard/php_smart_str.h" +#include "zend_smart_str_public.h" #include #define LIBXML_SAVE_NOEMPTYTAG 1<<2 -- cgit v1.2.1 From 2a7de9fdbba28152fadcdddc2b731d319405e106 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 21 Sep 2014 20:28:44 +0200 Subject: Rename smart_str_append to smart_str_append_smart_str It's used only rarely and I'm running out of append names... --- 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 9518654b5b..cccc83f8db 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -34,7 +34,7 @@ extern zend_module_entry libxml_module_entry; # define PHP_LIBXML_API #endif -#include "zend_smart_str_public.h" +#include "zend_smart_str.h" #include #define LIBXML_SAVE_NOEMPTYTAG 1<<2 -- cgit v1.2.1