- (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]

   Remove two obsolete Cygwin #ifdefs.  Patch from vinschen at redhat.com.

diff --git a/ChangeLog b/ChangeLog
index 55d7e8453ca555c9a1d62243ffa48e1a593df615..5b8a4ce31f8e71451f35b5046dc17c1a88b7c3fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-20050222
+20050226
+ - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
+   Remove two obsolete Cygwin #ifdefs.  Patch from vinschen at redhat.com.
+
+20050224
  - (djm) [configure.ac] in_addr_t test needs sys/types.h too
 
 20050222

diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index daf5f8b811f30edd9aded9cd27dac30fc7cd1baa..8eb62b7a8b45923ded4206453922cb4aeb971aa0 100644 (file)
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -102,7 +102,6 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp,
                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 *name, struct termios *termp,
 # ifndef __hpux
        ioctl(*aslave, I_PUSH, "ttcompat");
 # endif /* __hpux */
-#endif /* HAVE_CYGWIN */
 
        return (0);
 

diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c
index 7031625b4441b98c9184e34c4e0101018fadd7d8..47796c37032d7c3fe78133b870ee8f1297b34f52 100644 (file)
--- a/openbsd-compat/inet_ntop.c
+++ b/openbsd-compat/inet_ntop.c
@@ -35,9 +35,7 @@ static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.5 2002/08/23 16:27:31 itojun Ex
 #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>