diff options
| author | Christopher Jones <sixd@php.net> | 2013-11-06 10:37:22 -0800 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-12-12 15:22:55 -0800 |
| commit | bc748ba38ce93025178a0f9de6c444f5cd25ad1d (patch) | |
| tree | 97b368a23a57b8423f5223d994a3911c274ad34a | |
| parent | c9d00a23ae5e34bd03dd71f53b5be8b412ad4302 (diff) | |
| download | php-git-bc748ba38ce93025178a0f9de6c444f5cd25ad1d.tar.gz | |
OCI8 build change: Fix source variable definition for C89 compatibility
| -rw-r--r-- | ext/oci8/oci8.c | 4 | ||||
| -rw-r--r-- | ext/oci8/package.xml | 23 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index f8abacf3e6..1e505f13e9 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -2201,6 +2201,9 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char static int php_oci_connection_ping(php_oci_connection *connection TSRMLS_DC) { sword errstatus; +#if (!((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2)))) + char version[256]; +#endif OCI_G(errcode) = 0; /* assume ping is successful */ @@ -2212,7 +2215,6 @@ static int php_oci_connection_ping(php_oci_connection *connection TSRMLS_DC) #if ((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2))) /* OCIPing available 10.2 onwards */ PHP_OCI_CALL_RETURN(errstatus, OCIPing, (connection->svc, OCI_G(err), OCI_DEFAULT)); #else - char version[256]; /* use good old OCIServerVersion() */ PHP_OCI_CALL_RETURN(errstatus, OCIServerVersion, (connection->svc, OCI_G(err), (text *)version, sizeof(version), OCI_HTYPE_SVCCTX)); #endif diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 7be825b895..8e55b9abd5 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -49,8 +49,8 @@ libraries are available. <time>12:00:00</time> <version> - <release>2.0.6</release> - <api>2.0.6</api> + <release>2.0.7</release> + <api>2.0.7</api> </version> <stability> <release>stable</release> @@ -58,8 +58,7 @@ libraries are available. </stability> <license uri="http://www.php.net/license">PHP</license> <notes> -Added a LICENSE file to make it easier for PECL binary distributions -to conform with the license. + Build change: Fix source variable definition for C89 compatibility </notes> <contents> <dir name="/"> @@ -460,6 +459,22 @@ to conform with the license. <release> <version> + <release>2.0.6</release> + <api>2.0.6</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <license uri="http://www.php.net/license">PHP</license> + <notes> +Added a LICENSE file to make it easier for PECL binary distributions +to conform with the license. + </notes> +</release> + +<release> + <version> <release>2.0.5</release> <api>2.0.5</api> </version> diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index 7510415549..86c5abfa89 100644 --- a/ext/oci8/php_oci8.h +++ b/ext/oci8/php_oci8.h @@ -45,7 +45,7 @@ */ #undef PHP_OCI8_VERSION #endif -#define PHP_OCI8_VERSION "2.0.6" +#define PHP_OCI8_VERSION "2.0.7-dev" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry |