From: Christopher Jones <sixd@php.net>
Date: Tue, 11 Dec 2007 06:57:39 +0000 (+0000)
Subject: Sync with 5.2
X-Git-Tag: RELEASE_1_3_1~529
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=922d1fce296a14c970670a9325cccd409ba5df22;p=php

Sync with 5.2
---

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 379ab03d1a..ca44282e54 100755
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -494,9 +494,12 @@ static int oci_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval *return_valu
 			OCIClientVersion(&major, &minor, &update, &patch, &port_update);
 			slprintf(verstr, sizeof(verstr), "%d.%d.%d.%d.%d", major, minor, update, patch, port_update);
 			ZVAL_STRING(return_value, verstr, 1);
-#else
+#elif PHP_PDO_OCI_CLIENT_VERSION
 			/* Compile time client version */
 			ZVAL_STRING(return_value, PHP_PDO_OCI_CLIENT_VERSION, 1);
+#else
+			return FALSE;
+
 #endif /* Check for OCIClientVersion() support */
 
 			return TRUE;