summaryrefslogtreecommitdiff
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 704668e2a..a51117c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
8 - markus@cvs.openbsd.org 2006/09/19 21:14:08 8 - markus@cvs.openbsd.org 2006/09/19 21:14:08
9 [packet.c] 9 [packet.c]
10 client NULL deref on protocol error; Tavis Ormandy, Google Security Team 10 client NULL deref on protocol error; Tavis Ormandy, Google Security Team
11 - (dtucker) [defines.h] Include unistd.h before defining getpgrp; fixes
12 build error on Ultrix. From Bernhard Simon.
11 13
1220060918 1420060918
13 - (dtucker) [configure.ac] On AIX, check to see if the compiler will allow 15 - (dtucker) [configure.ac] On AIX, check to see if the compiler will allow
@@ -5468,4 +5470,4 @@
5468 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5470 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5469 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5471 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5470 5472
5471$Id: ChangeLog,v 1.4554 2006/09/21 03:00:25 dtucker Exp $ 5473$Id: ChangeLog,v 1.4555 2006/09/21 13:13:30 dtucker Exp $
diff --git a/defines.h b/defines.h
index 6b395f806..8a4e2c73e 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.137 2006/08/18 22:38:24 djm Exp $ */ 28/* $Id: defines.h,v 1.138 2006/09/21 13:13:30 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -556,6 +556,7 @@ struct winsize {
556#endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */ 556#endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */
557 557
558#ifndef GETPGRP_VOID 558#ifndef GETPGRP_VOID
559# include <unistd.h>
559# define getpgrp() getpgrp(0) 560# define getpgrp() getpgrp(0)
560#endif 561#endif
561 562