X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/fd9ede94165374c2c27c4eb9af543fa97ada65b1..090621f278e8710cb76027a0976fe97b99b6ab66:/includes.h

diff --git a/includes.h b/includes.h
index 554e9476..f9cf9c73 100644
--- a/includes.h
+++ b/includes.h
@@ -51,6 +51,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 +98,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"