From 069bbf3e8009795bfeec2d46cd4bb39d6907d29a Mon Sep 17 00:00:00 2001 From: Petr Sumbera Date: Tue, 14 Dec 2021 10:57:22 +0100 Subject: [PATCH] Fix zend_fibers.c build with ZEND_FIBER_UCONTEXT Avoids (Solaris SPARC) issue: zend_fibers.c:77:9: error: unknown type name 'ucontext_t' Closes GH-7773. --- NEWS | 1 + Zend/zend_fibers.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index af3a74ae1f293..a3b9a4c6c00a0 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,7 @@ PHP NEWS (cmb) . Fixed bug GH-7757 (Multi-inherited final constant causes fatal error). (cmb) + . Fixed zend_fibers.c build with ZEND_FIBER_UCONTEXT. (Petr Sumbera) - Filter: . Fixed FILTER_FLAG_NO_RES_RANGE flag. (Yifan Tong) diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c index 92ae9b8837cb7..dd06f86ae8da6 100644 --- a/Zend/zend_fibers.c +++ b/Zend/zend_fibers.c @@ -32,6 +32,10 @@ # include #endif +#ifdef ZEND_FIBER_UCONTEXT +# include +#endif + #ifndef ZEND_WIN32 # include # include @@ -118,7 +122,6 @@ static zend_always_inline void zend_fiber_restore_vm_state(zend_fiber_vm_state * } #ifdef ZEND_FIBER_UCONTEXT -# include ZEND_TLS zend_fiber_transfer *transfer_data; #else /* boost_context_data is our customized definition of struct transfer_t as