diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-05-25 09:00:20 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-05-25 09:00:20 +0000 |
| commit | f7ce69585c0809a40ff79ebc2d429720aadd4534 (patch) | |
| tree | 39e74961120eb089e9a206483d9afb1868e1c95d /Zend/zend_string.c | |
| parent | a389c77ce2ab5bf04e26a1ec41c3dc9a43722f68 (diff) | |
| download | php-git-f7ce69585c0809a40ff79ebc2d429720aadd4534.tar.gz | |
- Interned string related callbacks moved turned from compiler_globals into real globals
- Updated API version number
Diffstat (limited to 'Zend/zend_string.c')
| -rw-r--r-- | Zend/zend_string.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 098ad62713..99b24f64e9 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -29,9 +29,13 @@ # include <sys/mman.h> #endif -static char *zend_new_interned_string(char *str, int len, int free_src TSRMLS_DC); -static void zend_interned_strings_snapshot(TSRMLS_D); -static void zend_interned_strings_restore(TSRMLS_D); +ZEND_API char *(*zend_new_interned_string)(char *str, int len, int free_src TSRMLS_DC); +ZEND_API void (*zend_interned_strings_snapshot)(TSRMLS_D); +ZEND_API void (*zend_interned_strings_restore)(TSRMLS_D); + +static char *zend_new_interned_string_int(char *str, int len, int free_src TSRMLS_DC); +static void zend_interned_strings_snapshot_int(TSRMLS_D); +static void zend_interned_strings_restore_int(TSRMLS_D); void zend_interned_strings_init(TSRMLS_D) { @@ -59,9 +63,9 @@ void zend_interned_strings_init(TSRMLS_D) #endif - CG(new_interned_string) = zend_new_interned_string; - CG(interned_strings_snapshot) = zend_interned_strings_snapshot; - CG(interned_strings_restore) = zend_interned_strings_restore; + zend_new_interned_string = zend_new_interned_string_int; + zend_interned_strings_snapshot = zend_interned_strings_snapshot_int; + zend_interned_strings_restore = zend_interned_strings_restore_int; } void zend_interned_strings_dtor(TSRMLS_D) @@ -75,7 +79,7 @@ void zend_interned_strings_dtor(TSRMLS_D) #endif } -static char *zend_new_interned_string(char *arKey, int nKeyLength, int free_src TSRMLS_DC) +static char *zend_new_interned_string_int(char *arKey, int nKeyLength, int free_src TSRMLS_DC) { #ifndef ZTS ulong h; @@ -173,12 +177,12 @@ static char *zend_new_interned_string(char *arKey, int nKeyLength, int free_src #endif } -static void zend_interned_strings_snapshot(TSRMLS_D) +static void zend_interned_strings_snapshot_int(TSRMLS_D) { CG(interned_strings_snapshot_top) = CG(interned_strings_top); } -static void zend_interned_strings_restore(TSRMLS_D) +static void zend_interned_strings_restore_int(TSRMLS_D) { #ifndef ZTS Bucket *p; |