/tmp/cvsmLUuXQ

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index d34cc38215fee16a11f36f9c98ebfe542b597ab7..556e4b2e54cf20b91e98a99eaf5a496092ee1388 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -131,9 +131,16 @@ PHP_MINIT_FUNCTION(dir)
        REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_CS|CONST_PERSISTENT);
 
 #ifdef HAVE_GLOB
+#ifdef GLOB_MARK
        REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_CS | CONST_PERSISTENT);
-#ifdef PHP_WIN32
+#endif
+#ifdef GLOB_NOSORT
+  REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_CS | CONST_PERSISTENT);
+#endif
+#ifdef GLOB_NOCHECK
+       REGISTER_LONG_CONSTANT("GLOB_NOMATCH", GLOB_NOCHECK, CONST_CS | CONST_PERSISTENT);
+#endif
+#ifdef GLOB_NOESCAPE
        REGISTER_LONG_CONSTANT("GLOB_NOESCAPE", GLOB_NOESCAPE, CONST_CS | CONST_PERSISTENT);
 #endif
 #endif