From: Moriyoshi Koizumi Date: Wed, 29 Oct 2003 21:50:15 +0000 (+0000) Subject: This check's always necessary. X-Git-Tag: RELEASE_2_0_0RC1~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cca80292feece68a936f3c711fe57bc00695db59;p=php This check's always necessary. --- diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 58f3cd8ee1..d31ec400ab 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -399,13 +399,11 @@ PHP_FUNCTION(glob) RETURN_FALSE; } -#ifndef GLOB_NOMATCH /* now catch the FreeBSD style of "no matches" */ if (!globbuf.gl_pathc || !globbuf.gl_pathv) { array_init(return_value); return; } -#endif /* we assume that any glob pattern will match files from one directory only so checking the dirname of the first match should be sufficient */