clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.3' into PHP-5.4

Browse Source 
* PHP-5.3:
  Cleanup ZEND_MODULE_API_NO => 20050922
This commit is contained in:
Popa Adrian Marius 2014-04-28 12:13:11 +03:00
commit bb422cb60e
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/pdo_firebird/firebird_driver.c
View File

@ -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,8 +575,6 @@ 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);

6
ext/pdo_firebird/pdo_firebird.c
View File

@ -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),