Import of OpenSSH 4.4p1

[gssapi-openssh.git] / openssh / openbsd-compat / glob.c

diff --git a/openssh/openbsd-compat/glob.c b/openssh/openbsd-compat/glob.c
index f6a04ea3f4fe3f2efca01fefb22fd50f4f338112..b3dd2b1718b7caba69c3a642f77d1b72744e8c2a 100644 (file)
--- a/openssh/openbsd-compat/glob.c
+++ b/openssh/openbsd-compat/glob.c
@@ -34,7 +34,21 @@
 /* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
 
 #include "includes.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <dirent.h>
 #include <ctype.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \
+    !defined(GLOB_HAS_GL_MATCHC) || \
+    !defined(HAVE_DECL_GLOB_NOMATCH) || HAVE_DECL_GLOB_NOMATCH == 0
 
 static long
 get_arg_max(void)
@@ -48,9 +62,6 @@ get_arg_max(void)
 #endif
 }
 
-#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \
-    !defined(GLOB_HAS_GL_MATCHC)
-
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
  *