From 8fca87adb52eac356effd749f447eae7a805695a Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Mon, 30 Jul 2001 15:41:11 +0000 Subject: Updated to match TSRM changes. --- ext/pcre/php_pcre.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'ext/pcre/php_pcre.h') diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h index 0d00d09854..f566c263c9 100644 --- a/ext/pcre/php_pcre.h +++ b/ext/pcre/php_pcre.h @@ -54,25 +54,14 @@ typedef struct { #endif } pcre_cache_entry; -typedef struct { +ZEND_BEGIN_MODULE_GLOBALS(pcre) HashTable pcre_cache; -} php_pcre_globals; +ZEND_END_MODULE_GLOBALS(pcre) #ifdef ZTS -# define PCRE_LS_D php_pcre_globals *pcre_globals -# define PCRE_LS_DC , PCRE_LS_D -# define PCRE_LS_C pcre_globals -# define PCRE_LS_CC , PCRE_LS_C -# define PCRE_G(v) (pcre_globals->v) -# define PCRE_LS_FETCH() php_pcre_globals *pcre_globals = ts_resource(pcre_globals_id); +# define PCRE_G(v) TSRMG(pcre_globals_id, zend_pcre_globals *, v) #else -# define PCRE_LS_D -# define PCRE_LS_DC -# define PCRE_LS_C -# define PCRE_LS_CC # define PCRE_G(v) (pcre_globals.v) -# define PCRE_LS_FETCH() -extern ZEND_API php_pcre_globals pcre_globals; #endif #else -- cgit v1.2.1