From: Wez Furlong <wez@php.net>
Date: Wed, 22 Jun 2005 08:45:22 +0000 (+0000)
Subject: build related adjustments.
X-Git-Tag: php-5.1.0b2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=372c38a53a050f19c6ebf1f5696f1ee78f0388a3;p=php

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 1965da9fde..5a7709e7c8 100755
--- 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 22a6fc720f..c5c12a97b7 100755
--- 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)
 {