diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:06:52 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-10 08:06:52 +0100 |
| commit | e24dcf97f1af7165d14ff3f57f21c7c89225e1f7 (patch) | |
| tree | 60abfccec76ba16ad9c3a8b06847d0e254db214a /main/streams/plain_wrapper.c | |
| parent | 5b013e7935efb73e27ebc7d40dce7ef9a3644b14 (diff) | |
| parent | 696bd37e6757d77dc7ed44f3ea6451944ebaba96 (diff) | |
| download | php-git-e24dcf97f1af7165d14ff3f57f21c7c89225e1f7.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed condition check
Fixed condition check
another place
Fixed issue #2466 Invalid integer constant expression error in php.h
Diffstat (limited to 'main/streams/plain_wrapper.c')
| -rw-r--r-- | main/streams/plain_wrapper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 55b3d4278c..4cd6cca854 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1310,7 +1310,7 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, const char *url, i return 0; } -#if PHP_WIN32 +#ifdef PHP_WIN32 if (!php_win32_check_trailing_space(url, (int)strlen(url))) { php_error_docref1(NULL, url, E_WARNING, "%s", strerror(ENOENT)); return 0; @@ -1337,11 +1337,11 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url #endif mode_t mode; int ret = 0; -#if PHP_WIN32 +#ifdef PHP_WIN32 int url_len = (int)strlen(url); #endif -#if PHP_WIN32 +#ifdef PHP_WIN32 if (!php_win32_check_trailing_space(url, url_len)) { php_error_docref1(NULL, url, E_WARNING, "%s", strerror(ENOENT)); return 0; |