Skip to content

Commit 0d50613

Browse files
committed
OCI8 build change: Fix source variable definition for C89 compatibility
1 parent d17b684 commit 0d50613

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

ext/oci8/oci8.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2201,6 +2201,9 @@ php_oci_connection *php_oci_do_connect_ex(char *username, int username_len, char
22012201
static int php_oci_connection_ping(php_oci_connection *connection TSRMLS_DC)
22022202
{
22032203
sword errstatus;
2204+
#if (!((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2))))
2205+
char version[256];
2206+
#endif
22042207

22052208
OCI_G(errcode) = 0; /* assume ping is successful */
22062209

@@ -2212,7 +2215,6 @@ static int php_oci_connection_ping(php_oci_connection *connection TSRMLS_DC)
22122215
#if ((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2))) /* OCIPing available 10.2 onwards */
22132216
PHP_OCI_CALL_RETURN(errstatus, OCIPing, (connection->svc, OCI_G(err), OCI_DEFAULT));
22142217
#else
2215-
char version[256];
22162218
/* use good old OCIServerVersion() */
22172219
PHP_OCI_CALL_RETURN(errstatus, OCIServerVersion, (connection->svc, OCI_G(err), (text *)version, sizeof(version), OCI_HTYPE_SVCCTX));
22182220
#endif

ext/oci8/package.xml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,16 @@ libraries are available.
4949
<time>12:00:00</time>
5050

5151
<version>
52-
<release>2.0.6</release>
53-
<api>2.0.6</api>
52+
<release>2.0.7</release>
53+
<api>2.0.7</api>
5454
</version>
5555
<stability>
5656
<release>stable</release>
5757
<api>stable</api>
5858
</stability>
5959
<license uri="http://www.php.net/license">PHP</license>
6060
<notes>
61-
Added a LICENSE file to make it easier for PECL binary distributions
62-
to conform with the license.
61+
Build change: Fix source variable definition for C89 compatibility
6362
</notes>
6463
<contents>
6564
<dir name="/">
@@ -458,6 +457,22 @@ to conform with the license.
458457
</extsrcrelease>
459458
<changelog>
460459

460+
<release>
461+
<version>
462+
<release>2.0.6</release>
463+
<api>2.0.6</api>
464+
</version>
465+
<stability>
466+
<release>stable</release>
467+
<api>stable</api>
468+
</stability>
469+
<license uri="http://www.php.net/license">PHP</license>
470+
<notes>
471+
Added a LICENSE file to make it easier for PECL binary distributions
472+
to conform with the license.
473+
</notes>
474+
</release>
475+
461476
<release>
462477
<version>
463478
<release>2.0.5</release>

ext/oci8/php_oci8.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
#undef PHP_OCI8_VERSION
4747
#endif
48-
#define PHP_OCI8_VERSION "2.0.6"
48+
#define PHP_OCI8_VERSION "2.0.7-dev"
4949

5050
extern zend_module_entry oci8_module_entry;
5151
#define phpext_oci8_ptr &oci8_module_entry

0 commit comments

Comments
 (0)