diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 21:30:27 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-20 21:30:38 +0100 |
| commit | bbbaf1ca8559fc45d581de7b22e94d163cd28fc7 (patch) | |
| tree | 11e1477bf57a50a98608184fcf34feafd47c0fe8 | |
| parent | e672cd4385d5a72ca8a81677b8c894fdaacfce03 (diff) | |
| parent | 11ddf7669a58969ad9101032ce891b951819b3e1 (diff) | |
| download | php-git-bbbaf1ca8559fc45d581de7b22e94d163cd28fc7.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
| -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 ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2018, PHP 7.2.14 +- 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 3f1f85561f..1cfab63eee 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -399,7 +399,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 45d51060e3..59176f2334 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -89,7 +89,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); |