com php-src: made ext/date and ext/spl use static tsrm ls cache: ext/date/config.w32 ext/date/config0.m4 ext/date/php_date.h ext/spl/config.m4
ext/spl/config.w32 ext/spl/p hp_spl.h

From: Date: Wed, 15 Oct 2014 10:24:03 +0000
Subject: com php-src: made ext/date and ext/spl use static tsrm ls cache: ext/date/config.w32 ext/date/config0.m4 ext/date/php_date.h ext/spl/config.m4
ext/spl/config.w32 ext/spl/p hp_spl.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82343@lists.php.net to get a copy of this message
Commit: 991a04b068c0b49ed5022d8da735002c5187031b Author: Anatol Belski <ab@php.net> Wed, 15 Oct 2014 12:24:03 +0200 Parents: d6d856b6db68b152a9cf72d16324a10180735bee Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=991a04b068c0b49ed5022d8da735002c5187031b Log: made ext/date and ext/spl use static tsrm ls cache Changed paths: M ext/date/config.w32 M ext/date/config0.m4 M ext/date/php_date.h M ext/spl/config.m4 M ext/spl/config.w32 M ext/spl/php_spl.h Diff: diff --git a/ext/date/config.w32 b/ext/date/config.w32 index c97df72..64a4ae9 100755 --- a/ext/date/config.w32 +++ b/ext/date/config.w32 @@ -1,7 +1,7 @@ // $Id$ // vim:ft=javascript -EXTENSION("date", "php_date.c", false, "-Iext/date/lib"); +EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date"); AC_DEFINE('HAVE_DATE', 1, 'Have date/time support'); diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 index 0b46c68..867e891 100644 --- a/ext/date/config0.m4 +++ b/ext/date/config0.m4 @@ -4,7 +4,7 @@ dnl config.m4 for date extension sinclude(ext/date/lib/timelib.m4) sinclude(lib/timelib.m4) -PHP_DATE_CFLAGS="-I@ext_builddir@/lib" +PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" diff --git a/ext/date/php_date.h b/ext/date/php_date.h index aa46aa1..d8f8251 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -197,7 +197,7 @@ ZEND_BEGIN_MODULE_GLOBALS(date) ZEND_END_MODULE_GLOBALS(date) #ifdef ZTS -#define DATEG(v) TSRMG(date_globals_id, zend_date_globals *, v) +#define DATEG(v) ZEND_TSRMG(date_globals_id, zend_date_globals *, v) #else #define DATEG(v) (date_globals.v) #endif diff --git a/ext/spl/config.m4 b/ext/spl/config.m4 index a0f0d1a..869e542 100755 --- a/ext/spl/config.m4 +++ b/ext/spl/config.m4 @@ -22,6 +22,6 @@ int main(int argc, char **argv) { CPPFLAGS=$old_CPPFLAGS AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed]) AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) - PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no) + PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h]) PHP_ADD_EXTENSION_DEP(spl, pcre, true) diff --git a/ext/spl/config.w32 b/ext/spl/config.w32 index 77cbd20..56c466c 100644 --- a/ext/spl/config.w32 +++ b/ext/spl/config.w32 @@ -1,7 +1,7 @@ // $Id$ // vim:ft=javascript -EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c", false /*never shared */); +EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c", false /*never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('HAVE_SPL', 1); PHP_SPL="yes"; PHP_INSTALL_HEADERS("ext/spl", "php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h"); diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index 534a038..8db6f09 100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h @@ -67,7 +67,7 @@ ZEND_BEGIN_MODULE_GLOBALS(spl) ZEND_END_MODULE_GLOBALS(spl) #ifdef ZTS -# define SPL_G(v) TSRMG(spl_globals_id, zend_spl_globals *, v) +# define SPL_G(v) ZEND_TSRMG(spl_globals_id, zend_spl_globals *, v) extern int spl_globals_id; #else # define SPL_G(v) (spl_globals.v)

« previous php.cvs (#82343) next »