- (stevesk) OpenBSD CVS sync X11 localhost display

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index 554e9476e7308f3d51294cc2dff5bc2ad6dd6aca..96366cb59b8bd77089b1db3d0142ab20d6588c85 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -28,6 +28,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
+#include <sys/utsname.h>
 
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
@@ -51,6 +52,9 @@ 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
@@ -95,9 +99,6 @@ 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/openbsd-compat.h"
 #include "openbsd-compat/bsd-cygwin_util.h"