archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

OCI8 build change: Fix source variable definition for C89 compatibility

Browse source
This commit is contained in:
Christopher Jones 2013-11-06 10:37:22 -08:00
parent c9d00a23ae
commit bc748ba38c
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/oci8/oci8.c
View file

@ -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

23
ext/oci8/package.xml
View file

@ -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="/">
@ -458,6 +457,22 @@ to conform with the license.
</extsrcrelease>
<changelog>
<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>

2
ext/oci8/php_oci8.h
View file

@ -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