Hi,
the below patch removes two special cases for Cygwin, which are already
superfluous for a good while.
- openbsd-compat/bsd-openpty.c: Since openpty() is implemented in Cygwin
now, the bsd-openpty.c code just isn't build into OpenSSH on Cygwin.
So the Cygwin special case is useless.
- When building OpenSSH for Cygwin, the minires-devel package (development
package for the special "minires" resolver library for Cygwin) is
required. But this package also brings its own version of arpa/nameser.h,
so the #ifndef HAVE_CYGWIN is useless.
Corinna
Index: openbsd-compat/bsd-openpty.c
==================================================================RCS file:
/cvs/openssh_cvs/openbsd-compat/bsd-openpty.c,v
retrieving revision 1.3
diff -p -u -r1.3 bsd-openpty.c
--- openbsd-compat/bsd-openpty.c 17 Feb 2004 05:49:55 -0000 1.3
+++ openbsd-compat/bsd-openpty.c 24 Feb 2005 11:30:30 -0000
@@ -102,7 +102,6 @@ openpty(int *amaster, int *aslave, char
return (-1);
}
-#ifndef HAVE_CYGWIN
/*
* Try to push the appropriate streams modules, as described
* in Solaris pts(7).
@@ -112,7 +111,6 @@ openpty(int *amaster, int *aslave, char
# ifndef __hpux
ioctl(*aslave, I_PUSH, "ttcompat");
# endif /* __hpux */
-#endif /* HAVE_CYGWIN */
return (0);
Index: openbsd-compat/inet_ntop.c
==================================================================RCS file:
/cvs/openssh_cvs/openbsd-compat/inet_ntop.c,v
retrieving revision 1.9
diff -p -u -r1.9 inet_ntop.c
--- openbsd-compat/inet_ntop.c 24 Nov 2003 02:33:34 -0000 1.9
+++ openbsd-compat/inet_ntop.c 24 Feb 2005 11:30:30 -0000
@@ -35,9 +35,7 @@ static char rcsid[] = "$OpenBSD: inet_nt
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#ifndef HAVE_CYGWIN
#include <arpa/nameser.h>
-#endif
#include <string.h>
#include <errno.h>
#include <stdio.h>
--
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat, Inc.
