diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:07:24 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:07:24 +0100 |
| commit | e6423757645749dca781639d815f8348a4a20c98 (patch) | |
| tree | f9374fdad62f0e288a83be1abd7a5892d63532de /sapi/phpdbg | |
| parent | 60b68f19f0618c884b9d97da79bd0b5c06c35072 (diff) | |
| parent | 4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0 (diff) | |
| download | php-git-e6423757645749dca781639d815f8348a4a20c98.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
Fixed condition check
Fixed issue #2466 Invalid integer constant expression error in php.h
Diffstat (limited to 'sapi/phpdbg')
| -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 0b4e69ca0e..9fe4fc7885 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1257,7 +1257,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); |