- markus@cvs.openbsd.org 2001/03/23 14:28:32

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index f3cdae3c2d701f10afb1a17d4d99c6f92b09c3e8..8b7bb0ed83120fd0fa900ff256b92ca52f89867a 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -21,7 +21,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
 #include "config.h"
 
-#include "bsd-nextstep.h"
+#include "openbsd-compat/bsd-nextstep.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -45,18 +45,25 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <time.h>
 #include <dirent.h>
 
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
 #ifdef HAVE_GETOPT_H
-#include <getopt.h>
+# include <getopt.h>
 #endif
 #ifdef HAVE_BSTRING_H
 # include <bstring.h>
-#endif 
+#endif
+#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \
+    defined(GLOB_HAS_GL_MATCHC)
+# include <glob.h>
+#endif
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
-#endif 
+#endif
 #if defined(HAVE_NETDB_H)
 # include <netdb.h>
-#endif 
+#endif
 #ifdef HAVE_ENDIAN_H
 # include <endian.h>
 #endif
@@ -92,8 +99,8 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 # include <vis.h>
 #endif
 #include "version.h"
-#include "openbsd-compat.h"
-#include "bsd-cygwin_util.h"
+#include "openbsd-compat/openbsd-compat.h"
+#include "openbsd-compat/bsd-cygwin_util.h"
 #include "entropy.h"
 
 #endif /* INCLUDES_H */