summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--includes.h5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0141c327c..5a6923b04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -268,6 +268,7 @@
268 - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some 268 - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some
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 272
27220060313 27320060313
273 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 274 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4169,4 +4170,4 @@
4169 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4170 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4170 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4171 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4171 4172
4172$Id: ChangeLog,v 1.4221 2006/03/15 10:31:39 dtucker Exp $ 4173$Id: ChangeLog,v 1.4222 2006/03/15 10:48:54 djm Exp $
diff --git a/includes.h b/includes.h
index c9f6f3723..65c34c496 100644
--- a/includes.h
+++ b/includes.h
@@ -61,7 +61,10 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
61# include <maillock.h> /* For _PATH_MAILDIR */ 61# include <maillock.h> /* For _PATH_MAILDIR */
62#endif 62#endif
63#ifdef HAVE_NEXT 63#ifdef HAVE_NEXT
64# include <libc.h> 64# include <libc.h>
65#endif
66#ifdef HAVE_PATHS
67# include <paths.h>
65#endif 68#endif
66#include <unistd.h> /* For STDIN_FILENO, etc */ 69#include <unistd.h> /* For STDIN_FILENO, etc */
67 70