- millert@cvs.openbsd.org 2001/03/04 17:42:28

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index da08722ec9074bd9f1caf4b134324532b3ae5751..a4ebbd3d31ac6011a3f2e7c358c307ad015a8f00 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,3 +1,5 @@
+/*     $OpenBSD: includes.h,v 1.14 2001/01/29 01:58:16 niklas Exp $    */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -19,7 +21,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
 #include "config.h"
 
-#include "next-posix.h"
+#include "bsd-nextstep.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -27,18 +29,14 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <sys/wait.h>
 #include <sys/resource.h>
 
-#ifndef HAVE_CYGWIN
 #include <netinet/tcp.h>
-#endif
 #include <arpa/inet.h>
-#include <netdb.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <termios.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -46,20 +44,22 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <grp.h>
 #include <time.h>
 #include <dirent.h>
-#ifdef HAVE_CYGWIN
-#include <getopt.h>
-#endif
 
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif
 #ifdef HAVE_BSTRING_H
 # include <bstring.h>
-#endif 
+#endif
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
-#endif 
-#if defined(HAVE_NETDB_H) && !defined(HAVE_NEXT)
-/* Next includes this as part of another header */
+#endif
+#if defined(HAVE_NETDB_H)
 # include <netdb.h>
-#endif 
+#endif
 #ifdef HAVE_ENDIAN_H
 # include <endian.h>
 #endif
@@ -88,36 +88,15 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h>
 #endif
-
+#ifdef HAVE_UTIME_H
+# include <utime.h>
+#endif
+#ifdef HAVE_VIS_H
+# include <vis.h>
+#endif
 #include "version.h"
-
-/* OpenBSD function replacements */
 #include "openbsd-compat.h"
-
-/* Entropy collection */
+#include "bsd-cygwin_util.h"
 #include "entropy.h"
 
-/* Define this to be the path of the xauth program. */
-#ifndef XAUTH_PATH
-#define XAUTH_PATH "/usr/X11R6/bin/xauth"
-#endif /* XAUTH_PATH */
-
-/* Define this to be the path of the rsh program. */
-#ifndef _PATH_RSH
-#define _PATH_RSH "/usr/bin/rsh"
-#endif /* _PATH_RSH */
-
-/*
- * Define this to use pipes instead of socketpairs for communicating with the
- * client program.  Socketpairs do not seem to work on all systems.
- */
-/* #define USE_PIPES 1 */
-
-#ifdef HAVE_CYGWIN
-#define open binary_open
-#define pipe binary_pipe
-extern int binary_open();
-extern int binary_pipe();
-#endif
-
-#endif                         /* INCLUDES_H */
+#endif /* INCLUDES_H */