wez Wed Jun 22 04:45:22 2005 EDT
Modified files:
/php-src/ext/pdo_odbc pdo_odbc.c
/php-src/ext/pdo_odbc/tests prepare.inc
Log:
build related adjustments.
These need to be included in beta 2
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/pdo_odbc.c?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/pdo_odbc/pdo_odbc.c
diff -u php-src/ext/pdo_odbc/pdo_odbc.c:1.11
php-src/ext/pdo_odbc/pdo_odbc.c:1.12
--- php-src/ext/pdo_odbc/pdo_odbc.c:1.11 Wed Feb 9 00:03:59 2005
+++ php-src/ext/pdo_odbc/pdo_odbc.c Wed Jun 22 04:45:22 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_odbc.c,v 1.11 2005/02/09 05:03:59 wez Exp $ */
+/* $Id: pdo_odbc.c,v 1.12 2005/06/22 08:45:22 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -36,9 +36,17 @@
};
/* }}} */
+/* {{{ pdo_odbc_deps[] */
+static zend_module_dep pdo_odbc_deps[] = {
+ ZEND_MOD_REQUIRED("pdo")
+ {NULL, NULL, NULL}
+};
+/* }}} */
+
/* {{{ pdo_odbc_module_entry */
zend_module_entry pdo_odbc_module_entry = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER_EX, NULL,
+ pdo_odbc_deps,
"PDO_ODBC",
pdo_odbc_functions,
PHP_MINIT(pdo_odbc),
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/tests/prepare.inc?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo_odbc/tests/prepare.inc
diff -u php-src/ext/pdo_odbc/tests/prepare.inc:1.2
php-src/ext/pdo_odbc/tests/prepare.inc:1.3
--- php-src/ext/pdo_odbc/tests/prepare.inc:1.2 Tue Jun 14 20:17:18 2005
+++ php-src/ext/pdo_odbc/tests/prepare.inc Wed Jun 22 04:45:22 2005
@@ -7,7 +7,12 @@
);
//$DB = new pdo($CONNECTION, $USER, $PASSWD);
-$DB = new pdo($CONNECTION);
+try {
+ $DB = new pdo($CONNECTION);
+} catch (Exception $tmp) {
+ $DB = NULL;
+ return;
+}
foreach(array('test','classtypes') as $name)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
