867521fed7
Fix the following build failure with gcc 4.8 raised since bump of php-gnupg to version 1.5.0 in commit20ecd9c942and8b5b1e718f: .libs/gnupg_keylistiterator.o: In function `_phpc_res_close': gnupg_keylistiterator.c:(.text+0x2d4): multiple definition of `_phpc_res_close' Fixes: - http://autobuild.buildroot.org/results/d79/d79bc1b0f98d68eb8a7fe7d86af5ddcc75e42507/build-end.log Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From 887b0899d7e7423baec691255c2d8b56bb348ecd Mon Sep 17 00:00:00 2001
|
|
From: Jakub Zelenka <bukka@php.net>
|
|
Date: Sun, 14 Mar 2021 18:52:21 +0000
|
|
Subject: [PATCH] Remove inlining _phpc_res_close
|
|
|
|
[Retrieved from:
|
|
https://github.com/bukka/phpc/commit/887b0899d7e7423baec691255c2d8b56bb348ecd]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
phpc.h | 8 --------
|
|
1 file changed, 8 deletions(-)
|
|
|
|
diff --git a/phpc/phpc.h b/phpc/phpc.h
|
|
index dc5887e..9206105 100644
|
|
--- a/phpc/phpc.h
|
|
+++ b/phpc/phpc.h
|
|
@@ -945,16 +945,8 @@ typedef zend_resource * phpc_res_value_t;
|
|
zend_fetch_resource2(Z_RES_P(_pz_res), _res_type_name, _res_type_1, _res_type_2)
|
|
#define PHPC_RES_DELETE(_pz_res) \
|
|
zend_list_delete(Z_RES_P(_pz_res))
|
|
-#if PHP_MAJOR_VERSION < 8
|
|
#define PHPC_RES_CLOSE(_pz_res) \
|
|
zend_list_close(Z_RES_P(_pz_res))
|
|
-#else
|
|
-inline int _phpc_res_close(zval *zres) {
|
|
- zend_list_close(Z_RES_P(zres));
|
|
- return SUCCESS;
|
|
-}
|
|
-#define PHPC_RES_CLOSE _phpc_res_close
|
|
-#endif
|
|
|
|
/* resource to zval */
|
|
#define PHPC_RES_PZVAL(_res, _pzv) \
|