moriyoshi               Wed Oct 29 16:50:16 2003 EDT

  Modified files:              
    /php-src/ext/standard       dir.c 
  Log:
  This check's always necessary.
  
  
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.130 php-src/ext/standard/dir.c:1.131
--- php-src/ext/standard/dir.c:1.130    Wed Oct 29 13:48:37 2003
+++ php-src/ext/standard/dir.c  Wed Oct 29 16:50:15 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dir.c,v 1.130 2003/10/29 18:48:37 moriyoshi Exp $ */
+/* $Id: dir.c,v 1.131 2003/10/29 21:50:15 moriyoshi Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -399,13 +399,11 @@
                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 */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to