From 72c9a7e958689740cb3449df5732e0956d52ef5b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 24 Sep 2000 11:10:13 +1100 Subject: - (djm) Merged cleanup patch from Mark Miller - (djm) A bit more cleanup - created cygwin_util.h --- includes.h | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) (limited to 'includes.h') diff --git a/includes.h b/includes.h index da08722e..b7b01374 100644 --- a/includes.h +++ b/includes.h @@ -46,10 +46,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include #include #include -#ifdef HAVE_CYGWIN + +#ifdef HAVE_GETOPT_H #include #endif - #ifdef HAVE_BSTRING_H # include #endif @@ -90,34 +90,8 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #endif #include "version.h" - -/* OpenBSD function replacements */ #include "openbsd-compat.h" - -/* Entropy collection */ +#include "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 */ -- cgit v1.2.3