diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /main/streams/glob_wrapper.c | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'main/streams/glob_wrapper.c')
| -rw-r--r-- | main/streams/glob_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index d542e336e3..bae22dd6ab 100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c @@ -116,7 +116,7 @@ static void php_glob_stream_path_split(glob_s_t *pglob, const char *path, int ge if ((pos = strrchr(path, '/')) != NULL) { path = pos+1; } -#if defined(PHP_WIN32) || defined(NETWARE) +#ifdef PHP_WIN32 if ((pos = strrchr(path, '\\')) != NULL) { path = pos+1; } @@ -240,7 +240,7 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, const cha if ((tmp = strrchr(pos, '/')) != NULL) { pos = tmp+1; } -#if defined(PHP_WIN32) || defined(NETWARE) +#ifdef PHP_WIN32 if ((tmp = strrchr(pos, '\\')) != NULL) { pos = tmp+1; } |