Sync with 5.2

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 379ab03d1a2a55c942e63bb260d0f105267863b8..ca44282e54f2a4b473f15480f42b3b774042a0cd 100755 (executable)
--- 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;