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.

diff --git a/ext/standard/php_smart_str.h b/Zend/zend_smart_str.h
similarity index 97%
rename from ext/standard/php_smart_str.h
rename to Zend/zend_smart_str.h
index e32def230710d879f63abc49c3c360872fe80daf..0aff840b3d12efec9f64ec8713c6ca3d4bfcc3c3 100644 (file)
--- a/ext/standard/php_smart_str.h
+++ b/Zend/zend_smart_str.h
@@ -16,15 +16,11 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
+#ifndef ZEND_SMART_STR_H
+#define ZEND_SMART_STR_H
 
-#ifndef PHP_SMART_STR_H
-#define PHP_SMART_STR_H
-
-#include "php_smart_str_public.h"
-
-#include <stdlib.h>
 #include <zend.h>
+#include "zend_smart_str_public.h"
 
 #ifndef SMART_STR_PREALLOC
 #define SMART_STR_PREALLOC 128
@@ -34,8 +30,6 @@
 #define SMART_STR_START_SIZE 78
 #endif
 
-/* wrapper */
-
 #define smart_str_appends_ex(dest, src, what) \
        smart_str_appendl_ex((dest), (src), strlen(src), (what))
 #define smart_str_appends(dest, src) \
@@ -122,3 +116,4 @@ static zend_always_inline void smart_str_setl(smart_str *dest, const char *src,
 }
 
 #endif
+

diff --git a/ext/standard/php_smart_str_public.h b/Zend/zend_smart_str_public.h
similarity index 92%
rename from ext/standard/php_smart_str_public.h
rename to Zend/zend_smart_str_public.h
index e33348efd67ab57189cf310aff803ba8cb8aa675..23abe8e06411653d1021018a581e21db96284630 100644 (file)
--- a/ext/standard/php_smart_str_public.h
+++ b/Zend/zend_smart_str_public.h
@@ -16,12 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id$ */
-
-#ifndef PHP_SMART_STR_PUBLIC_H
-#define PHP_SMART_STR_PUBLIC_H
-
-#include <sys/types.h>
+#ifndef ZEND_SMART_STR_PUBLIC_H
+#define ZEND_SMART_STR_PUBLIC_H
 
 typedef struct {
        zend_string *s;

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 5c517d71a5eddeb1513fbe4f93d90a4fab983612..d7cacf54f9fae16818ad3d7b0c066ef4b31c2771 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -82,7 +82,7 @@
 
 #define SMART_STR_PREALLOC 4096
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/info.h"
 #include "ext/standard/file.h"
 #include "ext/standard/url.h"

diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index cc96a410f3d815b6d32855c0bc29f5b2fc2bbf83..665682c23a77d4b502ae3636684937392e8b2047 100644 (file)
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -23,7 +23,7 @@
 #define _PHP_CURL_H
 
 #include "php.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str_public.h"
 
 #ifdef COMPILE_DL_CURL
 #undef HAVE_CURL

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 3fd4b27eb30e2f13b2c2c18afa58adc8cbec5be9..360c6d3f67c36793301bc95b0205fe176120fc83 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -999,7 +999,7 @@ PHPAPI timelib_tzinfo *get_timezone_info(TSRMLS_D)
 
 
 /* {{{ date() and gmdate() data */
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 static char *mon_full_names[] = {
        "January", "February", "March", "April",

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 5ca29ed276d0ed43d3240541488454a317392708..de4ea4c464b5dde86d429c4e8d786dae1fb93a8f 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -519,7 +519,7 @@ PHP_MSHUTDOWN_FUNCTION(dba)
 }
 /* }}} */
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 /* {{{ PHP_MINFO_FUNCTION
  */

diff --git a/ext/filter/sanitizing_filters.c b/ext/filter/sanitizing_filters.c
index 8ddd55b95aa3f2b8c128969d90477a6e32d38abe..083b5382b6a7f2718b37b3c35ed91b3c6536598d 100644 (file)
--- a/ext/filter/sanitizing_filters.c
+++ b/ext/filter/sanitizing_filters.c
@@ -20,7 +20,7 @@
 
 #include "php_filter.h"
 #include "filter_private.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 /* {{{ STRUCTS */
 typedef unsigned long filter_map[256];

diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 5a51c50ea61835861578564e43b00abfdc3d3cf2..18e79651994b424c6fad11b3cfd94982eab91a92 100644 (file)
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -25,7 +25,7 @@
 #include "php_gmp.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str_public.h"
+#include "zend_smart_str_public.h"
 #include "zend_exceptions.h"
 
 #if HAVE_GMP

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 7ca97f94185e59520214bb929cf6f580f13f2fe9..d425f6cf1e9c35c5e884014b2589fb0c7430b5cc 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -55,7 +55,7 @@
 #undef iconv
 #endif
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/base64.h"
 #include "ext/standard/quot_print.h"
 

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index d937681507ba044370def1b0d5f7b41a9f3fc456..8dc56c52230311c187213ea9a9207065eacf2b0c 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -40,7 +40,7 @@
 #include "ext/standard/php_string.h"
 #include "ext/standard/info.h"
 #include "ext/standard/file.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/pcre/php_pcre.h"
 
 #ifdef ERROR

diff --git a/ext/intl/intl_error.h b/ext/intl/intl_error.h
index 6a809e8e39d7b3f1cd43c33b3f0aee486eadd3cf..7e8f0cf5e4615cd484ddd0ae737feb0fe1d52817 100644 (file)
--- a/ext/intl/intl_error.h
+++ b/ext/intl/intl_error.h
@@ -21,7 +21,7 @@
 
 #include <unicode/utypes.h>
 #include <unicode/parseerr.h>
-#include <ext/standard/php_smart_str.h>
+#include <zend_smart_str_public.h>
 
 #define INTL_ERROR_CODE(e) (e).code
 

diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index 267998364648564faafd78bb741aae0d3773b9ab..27f917ffbb3ed4f07cb73263921868b927fe91dc 100644 (file)
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -36,7 +36,7 @@
 #include <zend.h>
 #include <php.h>
 #include "main/php_ini.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 ZEND_EXTERN_MODULE_GLOBALS( intl )
 

diff --git a/ext/intl/transliterator/transliterator.h b/ext/intl/transliterator/transliterator.h
index 3e38095b8930afa854bf408bb9d0ccb25aa5f90c..041c6df41b9176c40f6b029c90ba145a3ec3879e 100644 (file)
--- a/ext/intl/transliterator/transliterator.h
+++ b/ext/intl/transliterator/transliterator.h
@@ -21,7 +21,7 @@
 #include <unicode/utypes.h>
 #include <unicode/utrans.h>
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str_public.h"
 
 void transliterator_register_constants( INIT_FUNC_ARGS );
 smart_str transliterator_parse_error_to_string( UParseError* pe );

diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h
index 3df999c5f38d62eee0f468fb48b4159adaa192d6..da47f4078fe3c9f6369a10ba71caf038f08888a1 100644 (file)
--- a/ext/json/JSON_parser.h
+++ b/ext/json/JSON_parser.h
@@ -4,8 +4,8 @@
 #define JSON_PARSER_H
 
 #include "php.h"
-#include "ext/standard/php_smart_str.h"
 #include "php_json.h"
+#include "zend_smart_str.h"
 
 #define JSON_PARSER_DEFAULT_DEPTH 512
 

diff --git a/ext/json/json.c b/ext/json/json.c
index 485d14d11b5f9ffa9436ac89040c9ddeeafb9d3d..16e452a0043551edcb9144bb7f8fd114993e17cf 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -26,7 +26,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/standard/html.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "JSON_parser.h"
 #include "php_json.h"
 #include <zend_exceptions.h>

diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index 05dcc43e06f26d60ad7402a08ee8df59513c9ed7..5b2dc127dd005ac870a20cb3775a003868c9c040 100644 (file)
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -22,7 +22,7 @@
 #define PHP_JSON_H
 
 #define PHP_JSON_VERSION "1.2.1"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str_public.h"
 
 extern zend_module_entry json_module_entry;
 #define phpext_json_ptr &json_module_entry

diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index b06462db2879e681afb6a11343c974fbbd9c2e68..9518654b5bd3d1e3d8c733f994578a51cb303341 100644 (file)
--- 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 <libxml/tree.h>
 
 #define LIBXML_SAVE_NOEMPTYTAG 1<<2

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 246f2223d1302f57adff1090a6bbe61934575f03..de0bc768ad383b0147f709d51ac8dee408b232ea 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -28,7 +28,7 @@
 
 #if HAVE_MBREGEX
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/info.h"
 #include "php_mbregex.h"
 #include "mbstring.h"

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index e572b7e4bac43dcb2a56aa5456cf6ee8392da0cb..82cbe72176afbcd7d71a256626b39c10367bd09f 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -40,7 +40,7 @@
 #include "php_globals.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_rand.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_mcrypt_filter.h"
 
 static int le_mcrypt;
@@ -452,7 +452,7 @@ static PHP_MSHUTDOWN_FUNCTION(mcrypt) /* {{{ */
 }
 /* }}} */
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 PHP_MINFO_FUNCTION(mcrypt) /* {{{ */
 {

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index eea63480344fa1286793847380b50327376e692e..4eff0989993dadf99c16597b198c38845261555d 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -30,7 +30,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index e137e822d8df2b7f9dbd6e5b093158b87f0b021a..db0d0ee677422c4d9e248ee8803210b2711f91da 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -29,7 +29,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 513df95a80fa91930f9375dfafb40e6b9c3e1393..41f34e366af19c974ffe0ed4abeec99d2f854b84 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -27,7 +27,7 @@
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_charset.h"
 #include "mysqlnd_debug.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 /*
   TODO :

diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c
index f37738dd120a4934c29c8b3878cd46a537de4889..daa758c043c1d4131e9ca0a38695d987d7f240ed 100644 (file)
--- a/ext/mysqlnd/mysqlnd_alloc.c
+++ b/ext/mysqlnd/mysqlnd_alloc.c
@@ -539,7 +539,7 @@ void _mysqlnd_free(void *ptr MYSQLND_MEM_D)
 
 #define SMART_STR_START_SIZE 2048
 #define SMART_STR_PREALLOC 512
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 
 /* {{{ _mysqlnd_pestrndup */

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 406c5a69b1512683d5b63cf8c304df508873d275..6be8b68034c025788e00e67264bb351a12ac366b 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -23,7 +23,7 @@
 #ifndef MYSQLND_STRUCTS_H
 #define MYSQLND_STRUCTS_H
 
-#include "ext/standard/php_smart_str_public.h"
+#include "zend_smart_str_public.h"
 
 #define MYSQLND_TYPEDEFED_METHODS
 

diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index c38975f146170c84c507a88fe24bc6a61229a482..a16018f6ba1c588eded9e946244cca6c0a800500 100644 (file)
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -27,7 +27,7 @@
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_reverse_api.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 /* {{{ mysqlnd_functions[]
  *

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index c941c8eaf2ee94c13f2db5df70e7587e3dd44596..dba13ced93651125476935db7426988cc3da8df4 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -33,7 +33,7 @@
 #include "php.h"
 #include "ext/standard/info.h"
 #include "php_ini.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 #if HAVE_OCI8
 

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 28afe1d4dd0feddfe8da20c7931e37c340123f83..b3213f9aeaf9dae1a3577b9396db757b2f766091 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -28,7 +28,7 @@
 #include "ext/standard/file.h"
 #include "ext/standard/url.h"
 #include "streams/php_streams_int.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_openssl.h"
 #include "php_network.h"
 #include <openssl/ssl.h>

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 3b49bf9ef50527c9dcca66ae8350d45de64230e2..67857da2c7a4478ca37b82095ff53f8612f0b97b 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -23,7 +23,7 @@
 #include "php_globals.h"
 #include "php_pcre.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 8ea4d3c06fea1b268ad6bf3f68e690f3215f7d64..207764b16512c531bd7a6c6aee04b671fb621d55 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -35,7 +35,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/php_standard.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/ereg/php_regex.h"
 #ifdef PHP_WIN32
 # include "win32/time.h"

diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index 77df0a71c2b1ac2364e5139383aca8b9cead5f32..f49143bc8cef4baf4e57a7c42a8f5cf7a60aaff3 100644 (file)
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -35,6 +35,7 @@
 #include "zend_operators.h"
 #include "zend_qsort.h"
 #include "zend_vm.h"
+#include "zend_smart_str.h"
 #include "main/php_streams.h"
 #include "main/streams/php_stream_plain_wrapper.h"
 #include "main/SAPI.h"
@@ -49,7 +50,6 @@
 #include "ext/standard/md5.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str.h"
 #include "ext/standard/php_versioning.h"
 #ifndef PHP_WIN32
 #include "TSRM/tsrm_strtok_r.h"

diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c
index 23841e4eea17589d348072e88e71e9a6a7d33992..ff0671ce9fa77cb9b76c47326dda0fc1d5f3aad6 100644 (file)
--- a/ext/readline/readline_cli.c
+++ b/ext/readline/readline_cli.c
@@ -42,7 +42,7 @@
 #include "php_main.h"
 #include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 #ifdef __riscos__
 #include <unixlib/local.h>

diff --git a/ext/readline/readline_cli.h b/ext/readline/readline_cli.h
index 0531c71e354bffb97b54a015c142f2df83dacd56..6e57c83408f2590471218ad4fdf9db67feeb6d1d 100644 (file)
--- a/ext/readline/readline_cli.h
+++ b/ext/readline/readline_cli.h
@@ -20,7 +20,7 @@
 /* $Id$ */
 
 #include "php.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str_public.h"
 
 ZEND_BEGIN_MODULE_GLOBALS(cli_readline)
        char *pager;

diff --git a/ext/session/session.c b/ext/session/session.c
index 18c02822e34495d4705b99636ef01882406ef319..63bb00e06a56b4e0e56bd4979c51982e8d75ac95 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -48,7 +48,7 @@
 #include "ext/standard/url_scanner_ex.h"
 #include "ext/standard/php_rand.h" /* for RAND_MAX */
 #include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/url.h"
 #include "ext/standard/basic_functions.h"
 #include "ext/standard/head.h"

diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
index 1cba5e7f07ba118bc7467caf695a842ac559fe50..6d3679298113666337a55f37fa9972b1e09d7c33 100644 (file)
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -29,7 +29,7 @@
 #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
 #include "ext/session/php_session.h"
 #endif
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_ini.h"
 #include "SAPI.h"
 #include <libxml/parser.h>

diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index f31208cf4d8c39872bde40dcc5855c8540787834..d8082717287890a9390482d9c30c992fe3cc1bc0 100644 (file)
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -6,7 +6,7 @@
 #endif
 
 #include <Zend/zend_llist.h>
-#include <ext/standard/php_smart_str.h>
+#include <zend_smart_str.h>
 
 #ifndef PHP_WIN32
 # include <sys/types.h>

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 11293eb5e54360ed0dfdc65d170d5a4e9f562943..211180a08dc285cbb8aa32671a8865473f9f2f8e 100644 (file)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -26,7 +26,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 

diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index a02cfb685da62e225a15a68618208be09eb8e39f..0a6f97c563891921f3d9667a2bbd97b48c47ce60 100644 (file)
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -29,7 +29,7 @@
 #include "php_spl.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "spl_functions.h"
 #include "spl_engine.h"
 #include "spl_iterators.h"

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 75f229dfc175eb03d4fb1b5d211ffa7633816ae2..dddc8c5e73e806d4fe3b428dd8d91cb9ff5f3141 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -35,7 +35,7 @@
 #include "spl_directory.h"
 #include "spl_array.h"
 #include "spl_exceptions.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 #ifdef accept
 #undef accept

diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 289e9212e8fff98fab9ada5c82de1558320194d3..d3ce72aaa3bbc162af2883e0f686aba004a82106 100644 (file)
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -28,7 +28,7 @@
 #include "ext/standard/info.h"
 #include "ext/standard/php_array.h"
 #include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 

diff --git a/ext/standard/array.c b/ext/standard/array.c
index de5639fbabff20527277d00972c52aa61f49bed6..c8e79957b5776031624315ef81b431c4ef976ff2 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -45,7 +45,7 @@
 #include "basic_functions.h"
 #include "php_string.h"
 #include "php_rand.h"
-#include "php_smart_str.h"
+#include "zend_smart_str.h"
 #ifdef HAVE_SPL
 #include "ext/spl/spl_array.h"
 #endif

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 66b0f0f5ff46ea726290fcfd16a84bb03ce5158c..506105b7ae0546412c5220249f1da144d65ec9b8 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -35,7 +35,7 @@
 #include "php_open_temporary_file.h"
 #include "ext/standard/basic_functions.h"
 #include "php_ini.h"
-#include "php_smart_str.h"
+#include "zend_smart_str.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ext/standard/filters.c b/ext/standard/filters.c
index e76ddfb6191c505a22943f07cccb700ee9c13a2d..bef239920bc0388498200c72d835f326fcc4a097 100644 (file)
--- a/ext/standard/filters.c
+++ b/ext/standard/filters.c
@@ -27,7 +27,7 @@
 #include "ext/standard/basic_functions.h"
 #include "ext/standard/file.h"
 #include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 /* {{{ rot13 stream filter implementation */
 static char rot13_from[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 83e894c123951467c5a0e55702ecc7d0cb1f4535..d69592699566414bbea1d2ce1395b8cd451de889 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -27,7 +27,7 @@
 #include "php_network.h"
 #include "php_ini.h"
 #include "ext/standard/basic_functions.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ext/standard/php_http.h b/ext/standard/php_http.h
index 0351b2a59ca8ff823348702c047b8ecb7b867eb4..097934831403a37d6b0f7dc6df1201cc7c14b38d 100644 (file)
--- a/ext/standard/php_http.h
+++ b/ext/standard/php_http.h
@@ -22,7 +22,7 @@
 #define PHP_HTTP_H
 
 #include "php.h"
-#include "php_smart_str.h"
+#include "zend_smart_str.h"
 
 PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
                                const char *num_prefix, int num_prefix_len,

diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h
index 5a9aae1a24392ff24f201399ec18d6b4d6d29dae..90979159abf29b80ea2ed017bffed98440d5575f 100644 (file)
--- a/ext/standard/php_var.h
+++ b/ext/standard/php_var.h
@@ -22,7 +22,7 @@
 #define PHP_VAR_H
 
 #include "ext/standard/basic_functions.h"
-#include "ext/standard/php_smart_str_public.h"
+#include "zend_smart_str_public.h"
 
 PHP_FUNCTION(var_dump);
 PHP_FUNCTION(var_export);

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 559fb8b57f998ce3b049f232ff302f047167719a..b49192b1b7493d43a6d4c1bc475f58e058706abd 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -56,7 +56,7 @@
 #include "zend_execute.h"
 #include "php_globals.h"
 #include "basic_functions.h"
-#include "php_smart_str.h"
+#include "zend_smart_str.h"
 #include <Zend/zend_exceptions.h>
 #ifdef ZTS
 #include "TSRM.h"

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index b7c9403f8bfab357adcaaf34f5f5fe5b787f1f03..71658ec2712c7363f70c8b09657bfb5d977e6e7c 100644 (file)
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -42,7 +42,7 @@
 
 #define url_scanner url_scanner_ex
 
-#include "php_smart_str.h"
+#include "zend_smart_str.h"
 
 static void tag_dtor(zval *zv)
 {

diff --git a/ext/standard/url_scanner_ex.h b/ext/standard/url_scanner_ex.h
index 00dd9fbfb0bd767180abfb2de435fa0ec30d7b07..3c5b68c95b31043d221ed27ca9054d2a6003516e 100644 (file)
--- a/ext/standard/url_scanner_ex.h
+++ b/ext/standard/url_scanner_ex.h
@@ -31,7 +31,7 @@ PHPAPI char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, co
 PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC);
 PHPAPI int php_url_scanner_reset_vars(TSRMLS_D);
 
-#include "php_smart_str_public.h"
+#include "zend_smart_str_public.h"
 
 typedef struct {
        /* Used by the mainloop of the scanner */

diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 28a5ca31965b56d54ffdfcd8ecec93a2f1ee1bd7..ce7acfad6b8441b34f63d35f7c6cce79a8cb8ccf 100644 (file)
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -40,7 +40,7 @@
 
 #define url_scanner url_scanner_ex
 
-#include "php_smart_str.h"
+#include "zend_smart_str.h"
 
 static void tag_dtor(zval *zv)
 {

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 532e53a110fb09645a58b61e26078198ae3294f9..88a8f9ebe0371cb5211db05c341f7b28007e4577 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -28,7 +28,7 @@
 #include "php.h"
 #include "php_string.h"
 #include "php_var.h"
-#include "php_smart_str.h"
+#include "zend_smart_str.h"
 #include "basic_functions.h"
 #include "php_incomplete_class.h"
 

diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index 15021783a62c4e9846a3c30960baa34ac3c5e4c5..d158366ea59ee20451796efeb236c99ad5f40696 100644 (file)
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "php_sysvmsg.h"
 #include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 /* In order to detect MSG_EXCEPT use at run time; we have no way
  * of knowing what the bit definitions are, so we can't just define

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index e0f9df3ac3c395753e5c5425a00acac5a69d4786..c87be09e4f45d56789464652d87963a2eeca47f3 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -36,7 +36,7 @@
 
 #include "php_sysvshm.h"
 #include "ext/standard/php_var.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_ini.h"
 
 /* {{{ arginfo */

diff --git a/ext/wddx/php_wddx_api.h b/ext/wddx/php_wddx_api.h
index 420377eb221f94f6b8c9e50f13ea722d53c73235..5c47109ee3ca9d21f144b6de3a7d4cfb164a486e 100644 (file)
--- a/ext/wddx/php_wddx_api.h
+++ b/ext/wddx/php_wddx_api.h
@@ -21,7 +21,7 @@
 #ifndef PHP_WDDX_API_H
 #define PHP_WDDX_API_H
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str_public.h"
 
 #define WDDX_ARRAY_S                   "<array length='%d'>"
 #define WDDX_ARRAY_E                   "</array>"

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index be5913d5219bb37f69340bcfbd7ab4e765855fe4..705babd8858c310046e4e4c4345c55e3158ea625 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -35,7 +35,7 @@
 #include "ext/standard/php_incomplete_class.h"
 #include "ext/standard/base64.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/html.h"
 #include "ext/standard/php_string.h"
 #include "ext/date/php_date.h"

diff --git a/main/php_variables.c b/main/php_variables.c
index c1d69532e0b7d22d4d62dd2d72c7a5acff98076f..a0acb38264728b5f131ff5ec15482b8258251086 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -23,7 +23,7 @@
 #include "php.h"
 #include "ext/standard/php_standard.h"
 #include "ext/standard/credits.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "php_variables.h"
 #include "php_globals.h"
 #include "php_content_types.h"

diff --git a/main/spprintf.c b/main/spprintf.c
index 12443a776907c7524b96b439c756233d47c89cf8..cf730dd964cfa91652055e89d415d0de7312f68c 100644 (file)
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -111,7 +111,7 @@
 #define FLOAT_DIGITS    6
 #define EXPONENT_LENGTH 10
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/php_smart_string.h"
 
 /* {{{ macros */

diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index 321df144168109f3dbd8b6240babd4f5ef19c171..ea137384f2787c95da85e6784920a760f6122939 100644 (file)
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -22,7 +22,7 @@
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include "php.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/info.h"
 #include "SAPI.h"
 

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 9d159327c0e33eca90807cdf3b6d3915e7ece21a..389686124dfeeeba67e1831dcb960a4d248ee4a8 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -30,7 +30,7 @@
 #include "php_variables.h"
 #include "SAPI.h"
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #ifndef NETWARE
 #include "ext/standard/php_standard.h"
 #else

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 27643b89172be81c83a8b0eed40f2c03b1fce0b0..d9ae4d97eace2fdf2d56ff0e5b46be94264ad3d7 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -21,7 +21,7 @@
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include "php.h"
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/info.h"
 #include "ext/standard/head.h"
 #include "php_ini.h"

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 08e6caff3c9d2b68a9ffb8cd8ff183d911d4cc7a..fe200304fd6df89700aa24602a6443a26ebedf0f 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -30,7 +30,7 @@
 
 #include <fcntl.h>
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #ifndef NETWARE
 #include "ext/standard/php_standard.h"
 #else

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index b2defe0841eed7128d6a36abd06834c1b87eb254..909e91e3fa84cef1fab021134cc6ebf991d835cc 100644 (file)
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -96,7 +96,7 @@
 #endif
 
 #include "ext/standard/file.h" /* for php_set_sock_blocking() :-( */
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 #include "ext/standard/html.h"
 #include "ext/standard/url.h" /* for php_url_decode() */
 #include "ext/standard/php_string.h" /* for php_dirname() */

diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 1671a5b65b77a55a89f583c35d9aea2d78b44cc9..7c03454f58a7e8b93fcb2faf49120cc86d04de25 100644 (file)
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -27,7 +27,7 @@
 #include "php_ini.h"
 #include "zend_highlight.h"
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 #include <sys/time.h>
 #include <sys/types.h>

diff --git a/sapi/thttpd/thttpd_patch b/sapi/thttpd/thttpd_patch
index c79ee44e62625ec26b05499a9abfa4907d617143..1a9ed29d60877fa80b63487e59a74b5ce0206859 100644 (file)
--- a/sapi/thttpd/thttpd_patch
+++ b/sapi/thttpd/thttpd_patch
@@ -240,7 +240,7 @@ diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
 +
 +#define SMART_STR_USE_REALLOC
 +
-+#include "ext/standard/php_smart_str.h"
++#include "zend_smart_str.h"
  
  static void
 -send_mime( httpd_conn* hc, int status, char* title, char* encodings, char* extraheads, char* type, int length, time_t mod )

diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c
index 9bff4f1695bd106454a74a09b85def239dcdfa64..783fe852bc854e7e7317ad213f3b1ecdcb2cdb3a 100644 (file)
--- a/sapi/tux/php_tux.c
+++ b/sapi/tux/php_tux.c
@@ -21,7 +21,7 @@
 #include "php_main.h"
 #include "php_variables.h"
 
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
 
 #include "tuxmodule.h"