diff --git a/ChangeLog b/ChangeLog index 704668e2a..a51117c88 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 6b395f806..8a4e2c73e 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 # define getpgrp() getpgrp(0) #endif