summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-11 10:17:41 +0200
committerRemi Collet <remi@remirepo.net>2021-06-11 10:17:41 +0200
commit703bf6e99af890f6b7903499431b2116a9cbca1a (patch)
treec60afb346b3c4f3e82fe676e3bb88e1cde405625
parent465bce1910106c9b9eef93276b938caf6f1e8f4a (diff)
fix the patchHEADmaster
-rw-r--r--pq-php81.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/pq-php81.patch b/pq-php81.patch
index 3d1fde6..f8e2c0a 100644
--- a/pq-php81.patch
+++ b/pq-php81.patch
@@ -263,3 +263,29 @@ index 3e334c6..9e622b4 100644
{0}
};
+
+From aaf7e8976c03dd38dcab4fbde35c5b0e6253c9d4 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 11 Jun 2021 10:15:56 +0200
+Subject: [PATCH 2/2] fix previous
+
+---
+ src/php_pq_misc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c
+index 9e622b4..70f32da 100644
+--- a/src/php_pq_misc.c
++++ b/src/php_pq_misc.c
+@@ -133,10 +133,10 @@ zend_class_entry *php_pqdt_class_entry;
+
+ #if PHP_VERSION_ID >= 80100
+ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_pqdt_jsonserialize, 0, 0, IS_MIXED, 0)
++ZEND_END_ARG_INFO()
+ #else
+ #define ai_pqdt_jsonserialize ai_pqdt_to_string
+ #endif
+-ZEND_END_ARG_INFO()
+
+ ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_to_string, 0, 0, 0)
+ ZEND_END_ARG_INFO();