summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-21 23:13:30 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-21 23:13:30 +1000
commit0dc5484ca690ff0dce0f9643523b10935140e086 (patch)
tree024b1337e003547fe49dc61729593c623820ef8f
parent4aa665b71c72666e23c318046835c3e0712d7e88 (diff)
- (dtucker) [defines.h] Include unistd.h before defining getpgrp; fixes
build error on Ultrix. From Bernhard Simon.
-rw-r--r--ChangeLog4
-rw-r--r--defines.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 704668e2..a51117c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
- markus@cvs.openbsd.org 2006/09/19 21:14:08
[packet.c]
client NULL deref on protocol error; Tavis Ormandy, Google Security Team
+ - (dtucker) [defines.h] Include unistd.h before defining getpgrp; fixes
+ build error on Ultrix. From Bernhard Simon.
20060918
- (dtucker) [configure.ac] On AIX, check to see if the compiler will allow
@@ -5468,4 +5470,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.4554 2006/09/21 03:00:25 dtucker Exp $
+$Id: ChangeLog,v 1.4555 2006/09/21 13:13:30 dtucker Exp $
diff --git a/defines.h b/defines.h
index 6b395f80..8a4e2c73 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.137 2006/08/18 22:38:24 djm Exp $ */
+/* $Id: defines.h,v 1.138 2006/09/21 13:13:30 dtucker Exp $ */
/* Constants */
@@ -556,6 +556,7 @@ struct winsize {
#endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */
#ifndef GETPGRP_VOID
+# include <unistd.h>
# define getpgrp() getpgrp(0)
#endif