diff options
| author | Popa Adrian Marius <mapopa@reea.net> | 2014-04-28 12:14:01 +0300 |
|---|---|---|
| committer | Popa Adrian Marius <mapopa@reea.net> | 2014-04-28 12:14:01 +0300 |
| commit | 0edf1d4fe6141cb8407604cfb1afdd203ec1e9a9 (patch) | |
| tree | 7594ba7ef3400f4ae48fc2d57b189b0ca9c0ba39 /ext/pdo_firebird | |
| parent | 3b6bf6eec87aa52f5fc98df341d7e101f72a72e2 (diff) | |
| parent | a827fa9cd81a70c8897b49fc7fe4d00061604884 (diff) | |
| download | php-git-0edf1d4fe6141cb8407604cfb1afdd203ec1e9a9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Cleanup ZEND_MODULE_API_NO => 20050922
Diffstat (limited to 'ext/pdo_firebird')
| -rw-r--r-- | ext/pdo_firebird/firebird_driver.c | 6 | ||||
| -rw-r--r-- | ext/pdo_firebird/pdo_firebird.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 2053a07005..1327861fe9 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -567,7 +567,7 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval *val TS #else HMODULE l = GetModuleHandle("fbclient"); - if (!l && !(l = GetModuleHandle("gds32"))) { + if (!l) { break; } info_func = (info_func_t)GetProcAddress(l, "isc_get_client_version"); @@ -575,9 +575,7 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval *val TS if (info_func) { info_func(tmp); ZVAL_STRING(val,tmp,1); - } else { - ZVAL_STRING(val,"Firebird 1.0/Interbase 6",1); - } + } #else ZVAL_NULL(val); #endif diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index 595a6a3987..d59aa53fa3 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -35,21 +35,15 @@ const zend_function_entry pdo_firebird_functions[] = { /* {{{ */ /* {{{ pdo_firebird_deps */ -#if ZEND_MODULE_API_NO >= 20050922 static const zend_module_dep pdo_firebird_deps[] = { ZEND_MOD_REQUIRED("pdo") ZEND_MOD_END }; -#endif /* }}} */ zend_module_entry pdo_firebird_module_entry = { /* {{{ */ -#if ZEND_MODULE_API_NO >= 20050922 STANDARD_MODULE_HEADER_EX, NULL, pdo_firebird_deps, -#else - STANDARD_MODULE_HEADER, -#endif "PDO_Firebird", pdo_firebird_functions, PHP_MINIT(pdo_firebird), |