@@ -602,14 +602,12 @@ void php_firebird_set_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *state,
602
602
einfo -> errmsg_length = read_len ;
603
603
einfo -> errmsg = pestrndup (buf , read_len , dbh -> is_persistent );
604
604
605
- #if FB_API_VER >= 25
606
605
char sqlstate [sizeof (pdo_error_type )];
607
606
fb_sqlstate (sqlstate , H -> isc_status );
608
607
if (sqlstate != NULL && strlen (sqlstate ) < sizeof (pdo_error_type )) {
609
608
strcpy (* error_code , sqlstate );
610
609
goto end ;
611
610
}
612
- #endif
613
611
} else if (msg && msg_len ) {
614
612
einfo -> errmsg_length = msg_len ;
615
613
einfo -> errmsg = pestrndup (msg , einfo -> errmsg_length , dbh -> is_persistent );
@@ -1333,7 +1331,6 @@ static int pdo_firebird_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
1333
1331
}
1334
1332
/* }}} */
1335
1333
1336
- #if FB_API_VER >= 30
1337
1334
/* called by PDO to check liveness */
1338
1335
static zend_result pdo_firebird_check_liveness (pdo_dbh_t * dbh ) /* {{{ */
1339
1336
{
@@ -1343,7 +1340,6 @@ static zend_result pdo_firebird_check_liveness(pdo_dbh_t *dbh) /* {{{ */
1343
1340
return fb_ping (H -> isc_status , & H -> db ) ? FAILURE : SUCCESS ;
1344
1341
}
1345
1342
/* }}} */
1346
- #endif
1347
1343
1348
1344
/* called by PDO to retrieve driver-specific information about an error that has occurred */
1349
1345
static void pdo_firebird_fetch_error_func (pdo_dbh_t * dbh , pdo_stmt_t * stmt , zval * info ) /* {{{ */
@@ -1383,11 +1379,7 @@ static const struct pdo_dbh_methods firebird_methods = { /* {{{ */
1383
1379
NULL , /* last_id not supported */
1384
1380
pdo_firebird_fetch_error_func ,
1385
1381
pdo_firebird_get_attribute ,
1386
- #if FB_API_VER >= 30
1387
1382
pdo_firebird_check_liveness ,
1388
- #else
1389
- NULL ,
1390
- #endif
1391
1383
NULL , /* get driver methods */
1392
1384
NULL , /* request shutdown */
1393
1385
pdo_firebird_in_manually_transaction ,
0 commit comments