diff options
author | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
commit | fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 (patch) | |
tree | c7bc98cac58386828871aae860f90cac0ebdcf8f /ext/rpc/java/java.c | |
parent | 2c254ba762d9392a732d5793b5b193ee6e395f1c (diff) | |
download | php-git-fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5.tar.gz |
- Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
Diffstat (limited to 'ext/rpc/java/java.c')
-rw-r--r-- | ext/rpc/java/java.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index e596c16fc3..7a65baa4bd 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -599,7 +599,7 @@ static void _php_java_destructor(zend_rsrc_list_entry *rsrc) } #ifdef ZTS -static void alloc_java_globals_ctor(php_java_globals *java_globals) { +static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) { memset(java_globals, 0, sizeof(php_java_globals)); } #endif @@ -624,7 +624,7 @@ PHP_MINIT_FUNCTION(java) { } #ifdef ZTS - java_globals_id = ts_allocate_id(sizeof(php_java_globals), + ts_allocate_id(&java_globals_id, sizeof(php_java_globals), (ts_allocate_ctor)alloc_java_globals_ctor, NULL); #endif |