diff options
| author | Wez Furlong <wez@php.net> | 2005-06-22 08:45:22 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2005-06-22 08:45:22 +0000 |
| commit | 372c38a53a050f19c6ebf1f5696f1ee78f0388a3 (patch) | |
| tree | 7f74c4e0811bc7ae20e3c8f7e152f31e835ffb3a | |
| parent | c3e2f113f381499dd02ba933452624f6abe8c6f1 (diff) | |
| download | php-git-372c38a53a050f19c6ebf1f5696f1ee78f0388a3.tar.gz | |
build related adjustments.
These need to be included in beta 2
| -rwxr-xr-x | ext/pdo_odbc/pdo_odbc.c | 10 | ||||
| -rwxr-xr-x | ext/pdo_odbc/tests/prepare.inc | 7 |
2 files changed, 15 insertions, 2 deletions
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) { |