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_prompt.c | |
| 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_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 05521016ac..544c973eec 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1307,7 +1307,7 @@ PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name) handle = DL_LOAD(*path); if (!handle) { -#if PHP_WIN32 +#ifdef PHP_WIN32 char *err = GET_DL_ERROR(); if (err && err[0]) { phpdbg_error("dl", "type=\"unknown\"", "%s", err); |