diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:47:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-10 14:47:42 +0800 |
| commit | 65d77812fcc0275aed58fd74b8d17d09a7e21ef2 (patch) | |
| tree | 2ca8b2dc909ab2d88a949b6846cf128e9cb21538 /main/streams/plain_wrapper.c | |
| parent | d65459f4eb764a77668a8f870ea85f3bbd12a13c (diff) | |
| parent | 4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0 (diff) | |
| download | php-git-65d77812fcc0275aed58fd74b8d17d09a7e21ef2.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed condition check
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 6bc0138f29..25eacceec5 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; |