diff options
| author | Remi Collet <remi@remirepo.net> | 2026-02-27 10:35:25 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-02-27 10:35:25 +0100 |
| commit | f0c4e46fc7f636393e0c927a60991ae5e715ca1e (patch) | |
| tree | 85701fe1332ccdee1f06d432d14d2c396a09d645 /6013.patch | |
| parent | 585fd601087c79a115346e51e7be057fead1332b (diff) | |
enable firebird using patch from
https://github.com/swoole/swoole-src/pull/6013
Diffstat (limited to '6013.patch')
| -rw-r--r-- | 6013.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/6013.patch b/6013.patch new file mode 100644 index 0000000..6ee45b4 --- /dev/null +++ b/6013.patch @@ -0,0 +1,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 |