summaryrefslogtreecommitdiffstats
path: root/1.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-02 09:22:09 +0100
committerRemi Collet <remi@remirepo.net>2021-03-02 09:22:09 +0100
commitbe2cbc1bc1736f5c0233b2f26bdd2e75d317d739 (patch)
tree2c431253f357729325a8bee46a982cb7e3f04e32 /1.patch
initial package
add build fix with PHP 8 from https://github.com/wikimedia/php-excimer/pull/1
Diffstat (limited to '1.patch')
-rw-r--r--1.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/1.patch b/1.patch
new file mode 100644
index 0000000..a2a6286
--- /dev/null
+++ b/1.patch
@@ -0,0 +1,31 @@
+From 435049e9b4b55955b77d32e29f7ea7df12799668 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 2 Mar 2021 08:48:09 +0100
+Subject: [PATCH] fix [-Wincompatible-pointer-types] with PHP 8
+
+---
+ excimer_log.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/excimer_log.c b/excimer_log.c
+index 4d5f74e..4c6b844 100644
+--- a/excimer_log.c
++++ b/excimer_log.c
+@@ -408,10 +408,17 @@ static void excimer_log_array_incr(HashTable *ht, zend_string *sp_key, zend_long
+ }
+ }
+
++#if PHP_VERSION_ID < 80000
+ static int excimer_log_aggr_compare(const void *a, const void *b)
+ {
+ zval *zp_a = &((Bucket*)a)->val;
+ zval *zp_b = &((Bucket*)b)->val;
++#else
++static int excimer_log_aggr_compare(Bucket *a, Bucket *b)
++{
++ zval *zp_a = &a->val;
++ zval *zp_b = &b->val;
++#endif
+
+ zval *zp_a_incl = zend_hash_str_find(Z_ARRVAL_P(zp_a), "inclusive", sizeof("inclusive")-1);
+ zval *zp_b_incl = zend_hash_str_find(Z_ARRVAL_P(zp_b), "inclusive", sizeof("inclusive")-1);