Skip to content

Commit b0ddef8

Browse files
committed
Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master: cleanup old unsupported versions of Firebird 1.0.x cleanup Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
2 parents 71a8b01 + 419d98b commit b0ddef8

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

ext/interbase/interbase.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -818,10 +818,6 @@ PHP_MINFO_FUNCTION(ibase)
818818
snprintf( (s = tmp), sizeof(tmp), "Firebird API version %d", FB_API_VER);
819819
#elif (SQLDA_CURRENT_VERSION > 1)
820820
s = "Interbase 7.0 and up";
821-
#elif !defined(DSC_null)
822-
s = "Interbase 6";
823-
#else
824-
s = "Firebird 1.0";
825821
#endif
826822
php_info_print_table_row(2, "Compile-time Client Library Version", s);
827823

@@ -840,8 +836,6 @@ PHP_MINFO_FUNCTION(ibase)
840836
#endif
841837
if (info_func) {
842838
info_func(s = tmp);
843-
} else {
844-
s = "Firebird 1.0/Interbase 6";
845839
}
846840
php_info_print_table_row(2, "Run-time Client Library Version", s);
847841
} while (0);

0 commit comments

Comments
 (0)