From: Popa Adrian Marius <mapopa@reea.net>
Date: Mon, 28 Apr 2014 09:12:52 +0000 (+0300)
Subject: Cleanup ZEND_MODULE_API_NO => 20050922
X-Git-Tag: php-5.4.29RC1~24^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbcd6304bb2dc5bdab4d25c7fac8e578354ed2d9;p=php

Cleanup ZEND_MODULE_API_NO => 20050922
---

diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
index a86ae424f4..73a6265a2c 100644
--- 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 1f14b55421..4fe0c34707 100644
--- 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();
 }
 /* }}} */