cvs: php-src(PHP_5_3) /ext/pdo_oci oci_driver.c

sixd Tue Dec 11 06:57:40 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo_oci oci_driver.c Log: Sync with 5.2 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.24.2.4.2.7&r2=1.24.2.4.2.7.2.1&diff_format=u Index: php-src/ext/pdo_oci/oci_driver.c diff -u php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7 php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7.2.1 --- php-src/ext/pdo_oci/oci_driver.c:1.24.2.4.2.7 Fri Aug 31 21:08:48 2007 +++ php-src/ext/pdo_oci/oci_driver.c Tue Dec 11 06:57:39 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci_driver.c,v 1.24.2.4.2.7 2007/08/31 21:08:48 sixd Exp $ */ +/* $Id: oci_driver.c,v 1.24.2.4.2.7.2.1 2007/12/11 06:57:39 sixd Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -494,9 +494,12 @@ 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;