Forgot to check in before.

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index a4ebbd3d31ac6011a3f2e7c358c307ad015a8f00..f9cf9c73ea4063b4741ba21d9f80e9e89689b8eb 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: includes.h,v 1.14 2001/01/29 01:58:16 niklas Exp $    */
+/*     $OpenBSD: includes.h,v 1.15 2001/06/08 15:25:40 markus Exp $    */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -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>
@@ -51,9 +51,16 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #endif
+#ifndef HAVE_GETOPT_OPTRESET
+#define getopt(ac, av, o)  BSDgetopt(ac, av, o)
+#endif
 #ifdef HAVE_BSTRING_H
 # include <bstring.h>
 #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
@@ -91,12 +98,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_UTIME_H
 # include <utime.h>
 #endif
-#ifdef HAVE_VIS_H
-# 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 */