summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-03-15 22:25:54 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-03-15 22:25:54 +1100
commitdc6118e1272e91fd4faebde7b2ea85a36dd6f08d (patch)
treeb4af3fdae524eb1c2e73eb9802b3707a4369ae3e
parentb0024914c98f4e622e1d1ae0ecc67d3fe9dd9830 (diff)
- (dtucker) [openbsd-compat/openbsd-compat.h] AIX (at least) needs
sys/ioctl.h for struct winsize.
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/openbsd-compat.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a6923b04..339568ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -269,6 +269,8 @@
269 includes removed from includes.h 269 includes removed from includes.h
270 - (dtucker) [configure.ac] Fix glob test conversion to AC_TRY_COMPILE 270 - (dtucker) [configure.ac] Fix glob test conversion to AC_TRY_COMPILE
271 - (djm) [includes.h] Put back paths.h, it is needed in defines.h 271 - (djm) [includes.h] Put back paths.h, it is needed in defines.h
272 - (dtucker) [openbsd-compat/openbsd-compat.h] AIX (at least) needs
273 sys/ioctl.h for struct winsize.
272 274
27320060313 27520060313
274 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 276 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4170,4 +4172,4 @@
4170 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4172 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4171 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4173 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4172 4174
4173$Id: ChangeLog,v 1.4222 2006/03/15 10:48:54 djm Exp $ 4175$Id: ChangeLog,v 1.4223 2006/03/15 11:25:54 dtucker Exp $
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 9022c793f..432b183e7 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openbsd-compat.h,v 1.34 2006/03/15 02:02:31 djm Exp $ */ 1/* $Id: openbsd-compat.h,v 1.35 2006/03/15 11:25:55 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved. 4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -147,6 +147,7 @@ int asprintf(char **, const char *, ...);
147#endif 147#endif
148 148
149#ifndef HAVE_OPENPTY 149#ifndef HAVE_OPENPTY
150# include <sys/ioctl.h> /* for struct winsize */
150int openpty(int *, int *, char *, struct termios *, struct winsize *); 151int openpty(int *, int *, char *, struct termios *, struct winsize *);
151#endif /* HAVE_OPENPTY */ 152#endif /* HAVE_OPENPTY */
152 153