com php-src: linux compat for the static tsrm ls cache pointer: TSRM/TSRM.h Zend/Makefile.am configure.in

Commit: 45e23645a42ba939fb1cca9cc099f977af2a4722 Author: Anatol Belski <ab@php.net> Thu, 2 Oct 2014 08:45:53 +0200 Parents: f5292fbe51faee145a973843d840a611a9da24bc Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45e23645a42ba939fb1cca9cc099f977af2a4722 Log: linux compat for the static tsrm ls cache pointer Changed paths: M TSRM/TSRM.h M Zend/Makefile.am M configure.in Diff: diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 4f73455..b303c13 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -172,7 +172,7 @@ TSRM_API inline void *tsrm_get_ls_cache(void); #define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) #define TSRMG_STATIC(id, type, element) (((type) (*((void ***) _tsrm_ls_cache))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) -#define TSRMLS_CACHE_EXTERN TSRM_TLS extern void *_tsrm_ls_cache +#define TSRMLS_CACHE_EXTERN extern TSRM_TLS void *_tsrm_ls_cache #define TSRMLS_CACHE_DEFINE TSRM_TLS void *_tsrm_ls_cache #define TSRMLS_CACHE_UPDATE _tsrm_ls_cache = tsrm_get_ls_cache() diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 2a76db3..09018a0 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -20,6 +20,7 @@ libZend_la_SOURCES=\ zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \ zend_generators.c zend_virtual_cwd.c zend_ast.c +libZend_la_CFLAGS = -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 libZend_la_LDFLAGS = libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ diff --git a/configure.in b/configure.in index f947d2f..5366a92 100644 --- a/configure.in +++ b/configure.in @@ -1491,7 +1491,8 @@ PHP_ADD_SOURCES(Zend, \ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ zend_closures.c zend_float.c zend_string.c zend_signal.c zend_generators.c \ zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \ - zend_default_classes.c zend_inheritance.c) + zend_default_classes.c zend_inheritance.c, \ + -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) dnl Selectively disable optimization due to high RAM usage during dnl compiling the executor.