diff options
Diffstat (limited to 'ext/dba/dba_db4.c')
| -rw-r--r-- | ext/dba/dba_db4.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c index a9752a7bf6..393c565b2a 100644 --- a/ext/dba/dba_db4.c +++ b/ext/dba/dba_db4.c @@ -42,13 +42,12 @@ static void php_dba_db4_errcall_fcn( #endif const char *errpfx, const char *msg) { - TSRMLS_FETCH(); #if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)) /* Bug 51086, Berkeley DB 4.8.26 */ /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test compatibility */ { - const char *function = get_active_function_name(TSRMLS_C); + const char *function = get_active_function_name(); if (function && (!strcmp(function,"dba_popen") || !strcmp(function,"dba_open")) && (!strncmp(msg, "fop_read_meta", sizeof("fop_read_meta")-1) || !strncmp(msg, "BDB0004 fop_read_meta", sizeof("BDB0004 fop_read_meta")-1))) { @@ -57,7 +56,7 @@ static void php_dba_db4_errcall_fcn( } #endif - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s%s", errpfx?errpfx:"", msg); + php_error_docref(NULL, E_NOTICE, "%s%s", errpfx?errpfx:"", msg); } #define DB4_DATA dba_db4_data *dba = info->dbf @@ -239,7 +238,7 @@ DBA_FIRSTKEY_FUNC(db4) } /* we should introduce something like PARAM_PASSTHRU... */ - return dba_nextkey_db4(info, newlen TSRMLS_CC); + return dba_nextkey_db4(info, newlen); } DBA_NEXTKEY_FUNC(db4) |