cvs: php-src /ext/pdo_oci oci_driver.c
| From: | Christopher Jones | Date: | Tue, 11 Dec 2007 07:08:37 +0000 |
| Subject: | cvs: php-src /ext/pdo_oci oci_driver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47427@lists.php.net to get a copy of this message | ||
sixd Tue Dec 11 07:08:37 2007 UTC
Modified files:
/php-src/ext/pdo_oci oci_driver.c
Log:
MFB: sync version macro check
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_driver.c?r1=1.34&r2=1.35&diff_format=u
Index: php-src/ext/pdo_oci/oci_driver.c
diff -u php-src/ext/pdo_oci/oci_driver.c:1.34 php-src/ext/pdo_oci/oci_driver.c:1.35
--- php-src/ext/pdo_oci/oci_driver.c:1.34 Fri Aug 31 21:11:03 2007
+++ php-src/ext/pdo_oci/oci_driver.c Tue Dec 11 07:08:37 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci_driver.c,v 1.34 2007/08/31 21:11:03 sixd Exp $ */
+/* $Id: oci_driver.c,v 1.35 2007/12/11 07:08:37 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -492,9 +492,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;