Cleanup ZEND_MODULE_API_NO => 20050922

diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
index a86ae424f49d3b4de5aa306eb6d768d3477fc9dc..73a6265a2cab7d6a5e9b5cc7d4a733e95d7127c2 100644 (file)
--- a/ext/pdo_firebird/firebird_driver.c
+++ b/ext/pdo_firebird/firebird_driver.c
@@ -569,7 +569,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");
@@ -577,9 +577,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 1f14b554215e6733fe650853af665ff0204791b0..4fe0c3470781fdab2f4c066c962c5c87c2d4cdfc 100644 (file)
--- a/ext/pdo_firebird/pdo_firebird.c
+++ b/ext/pdo_firebird/pdo_firebird.c
@@ -37,21 +37,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),
@@ -91,7 +85,7 @@ PHP_MSHUTDOWN_FUNCTION(pdo_firebird) /* {{{ */
 PHP_MINFO_FUNCTION(pdo_firebird) /* {{{ */
 {
        php_info_print_table_start();
-       php_info_print_table_header(2, "PDO Driver for Firebird/InterBase", "enabled");
+       php_info_print_table_header(2, "PDO Driver for Firebird", "enabled");
        php_info_print_table_end();
 }
 /* }}} */