diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:49:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:49:13 +0800 |
| commit | 696bd37e6757d77dc7ed44f3ea6451944ebaba96 (patch) | |
| tree | 94fcb38264a7103e7fc5892d155006c5306da68b /sapi/phpdbg/phpdbg.h | |
| parent | 4e9f0a80b9748c03e7bae6339ec051b815f5a569 (diff) | |
| parent | 9398f15efd58899df21f5e0cf032b8881fe71f3f (diff) | |
| download | php-git-696bd37e6757d77dc7ed44f3ea6451944ebaba96.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed condition check
Fixed condition check
another place
Conflicts:
ext/mcrypt/mcrypt.c
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 2a22251219..ef3b017b6d 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -48,7 +48,7 @@ #include "zend_signal.h" #if !defined(_WIN32) && !defined(ZEND_SIGNALS) && defined(HAVE_SIGNAL_H) # include <signal.h> -#elif PHP_WIN32 +#elif defined(PHP_WIN32) # include "win32/signal.h" #endif #include "SAPI.h" |