summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-02-26 10:04:28 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-02-26 10:04:28 +1100
commit34233830a1f42e95ddad5ff1cff9f9024d422861 (patch)
treed7876b18917dd7508df46f464f64394cafd073ee
parent848b99363987c3cc7abffb182d519dbea8c4f8ab (diff)
- (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com.
-rw-r--r--ChangeLog8
-rw-r--r--openbsd-compat/bsd-openpty.c2
-rw-r--r--openbsd-compat/inet_ntop.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bb126761..f12f6f90 100644
--- 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
@@ -2163,4 +2167,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3663 2005/02/24 01:12:34 djm Exp $
+$Id: ChangeLog,v 1.3664 2005/02/25 23:04:28 dtucker Exp $
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index daf5f8b8..8eb62b7a 100644
--- 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 7031625b..47796c37 100644
--- 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>