diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-26 11:34:21 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-26 11:34:21 -0700 |
| commit | fc410f6ecec9b4b096cf44ea1f86354e258da67c (patch) | |
| tree | 92e55af1bdd3c9e008762315b1622b498f89fcb0 /ext/oci8/oci8.c | |
| parent | c67714b782258efd4be67c0a5a4a72a8c10a6c1c (diff) | |
| parent | 586fc4909e7b279ac6109fe2970f3effba256dcb (diff) | |
| download | php-git-fc410f6ecec9b4b096cf44ea1f86354e258da67c.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Fix --enable-maintainer-zts mode in OCI8 2.0
Diffstat (limited to 'ext/oci8/oci8.c')
| -rw-r--r-- | ext/oci8/oci8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index c3bb49c2df..fe22c6f459 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -2684,7 +2684,7 @@ void php_oci_fetch_row (INTERNAL_FUNCTION_PARAMETERS, int mode, int expected_arg } if (invokedstatement->impres_count > 0) { /* Make it so the fetch occurs on the first Implicit Result Set */ - statement = php_oci_get_implicit_resultset(invokedstatement); + statement = php_oci_get_implicit_resultset(invokedstatement TSRMLS_CC); if (!statement) RETURN_FALSE; invokedstatement->impres_count--; @@ -2701,7 +2701,7 @@ void php_oci_fetch_row (INTERNAL_FUNCTION_PARAMETERS, int mode, int expected_arg /* End of fetch */ if (invokedstatement->impres_count > 0) { /* Check next Implicit Result Set */ - statement = php_oci_get_implicit_resultset(invokedstatement); + statement = php_oci_get_implicit_resultset(invokedstatement TSRMLS_CC); if (!statement) RETURN_FALSE; invokedstatement->impres_count--; |