diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 21:30:44 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 21:30:53 +0100 |
| commit | b6d5d92661e950edd88b4ee4046bba7a2cc33d57 (patch) | |
| tree | cc7ea0c6ae67e76f87294d4ef02b7afe539a2179 | |
| parent | 7a0d3406f69cbca40d97a37755282dc463605110 (diff) | |
| parent | bbbaf1ca8559fc45d581de7b22e94d163cd28fc7 (diff) | |
| download | php-git-b6d5d92661e950edd88b4ee4046bba7a2cc33d57.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | Zend/zend_signal.c | 2 | ||||
| -rw-r--r-- | Zend/zend_signal.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.3.0 +- Core: + . Fixed bug #71041 (zend_signal_startup() needs ZEND_API). + (Valentin V. Bartenev) + - Sockets: . Fixed bug #77136 (Unsupported IPV6_RECVPKTINFO constants on macOS). (Mizunashi Mana) diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index c4d4c8d3c9..4f05579b2c 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -397,7 +397,7 @@ void zend_signal_init(void) /* {{{ */ /* {{{ zend_signal_startup * alloc zend signal globals */ -void zend_signal_startup(void) +ZEND_API void zend_signal_startup(void) { #ifdef ZTS diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index 54ca32e31b..37bb0139d5 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -87,7 +87,7 @@ ZEND_API void zend_signal_handler_unblock(void); void zend_signal_activate(void); void zend_signal_deactivate(void); BEGIN_EXTERN_C() -void zend_signal_startup(void); +ZEND_API void zend_signal_startup(void); END_EXTERN_C() void zend_signal_init(void); |