build related adjustments.

These need to be included in beta 2

diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index 1965da9fde1afda3787e506a25dcda601cbdb077..5a7709e7c8a914c04c8e6f33f3558b21ac727d2f 100755 (executable)
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -36,9 +36,17 @@ function_entry pdo_odbc_functions[] = {
 };
 /* }}} */
 
+/* {{{ 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),

diff --git a/ext/pdo_odbc/tests/prepare.inc b/ext/pdo_odbc/tests/prepare.inc
index 22a6fc720f6541331d03ebdb99de91ed315611c8..c5c12a97b7cfc1804f0d97fb44b8e6bab0a1e91d 100755 (executable)
--- a/ext/pdo_odbc/tests/prepare.inc
+++ b/ext/pdo_odbc/tests/prepare.inc
@@ -7,7 +7,12 @@ $SQL = array(
 );
 
 //$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)
 {