1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 06c7656c218c284bbb793a18a54ef221f125335c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 27 Feb 2026 10:29:56 +0100
Subject: [PATCH] Fix #6004 drop broken conditionals, PHP_VERSION_ID not
defined
---
thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp | 2 --
thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp | 3 ---
2 files changed, 5 deletions(-)
diff --git a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
index 2c07099252..715963eec1 100644
--- a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
+++ b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
@@ -18,7 +18,6 @@
#include <firebird/Interface.h>
#include <cstring>
-#if PHP_VERSION_ID < 80500
/* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
extern "C" unsigned fb_get_client_version(void)
{
@@ -90,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T
}
#endif
-#endif
diff --git a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
index 1398b42260..715963eec1 100644
--- a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
+++ b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
@@ -18,8 +18,6 @@
#include <firebird/Interface.h>
#include <cstring>
-#if PHP_VERSION_ID >= 80500
-
/* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
extern "C" unsigned fb_get_client_version(void)
{
@@ -91,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T
}
#endif
-#endif
|
