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/oracle | |
| 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/oracle')
| -rw-r--r-- | ext/oracle/oracle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index 3ea87d3dc8..37651537f3 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -286,7 +286,7 @@ static void php_close_ora_cursor(zend_rsrc_list_entry *rsrc) /* {{{ php_ora_init_globals */ -static void php_ora_init_globals(ORALS_D) +static void php_ora_init_globals(ORALS_D TSRMLS_DC) { if (cfg_get_long("oracle.allow_persistent", &ORA(allow_persistent)) @@ -319,9 +319,9 @@ PHP_MINIT_FUNCTION(oracle) { #ifdef ZTS - ora_globals_id = ts_allocate_id(sizeof(php_ora_globals), (ts_allocate_ctor) php_ora_init_globals, NULL); + ts_allocate_id(&ora_globals_id, sizeof(php_ora_globals), (ts_allocate_ctor) php_ora_init_globals, NULL); #else - php_ora_init_globals(ORALS_C); + php_ora_init_globals(ORALS_C TSRMLS_CC); #endif le_cursor = zend_register_list_destructors_ex(php_close_ora_cursor, NULL, "oracle cursor", module_number); @@ -1742,7 +1742,7 @@ int ora_set_param_values(oraCursor *cursor, int isout) pval **pdata; int i, len, plen; - ELS_FETCH(); + TSRMLS_FETCH(); zend_hash_internal_pointer_reset(cursor->params); |