summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 21:48:54 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 21:48:54 +1100
commitb0024914c98f4e622e1d1ae0ecc67d3fe9dd9830 (patch)
treec4c6accb555227f32ffb91ba04ffd2571876f75b
parent486d95e6f78e7b27bbdc932ee6fdce0d28b2f8d9 (diff)
- (djm) [includes.h] Put back paths.h, it is needed in defines.h
-rw-r--r--ChangeLog3
-rw-r--r--includes.h5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0141c327..5a6923b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -268,6 +268,7 @@
- (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some
includes removed from includes.h
- (dtucker) [configure.ac] Fix glob test conversion to AC_TRY_COMPILE
+ - (djm) [includes.h] Put back paths.h, it is needed in defines.h
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4169,4 +4170,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.4221 2006/03/15 10:31:39 dtucker Exp $
+$Id: ChangeLog,v 1.4222 2006/03/15 10:48:54 djm Exp $
diff --git a/includes.h b/includes.h
index c9f6f372..65c34c49 100644
--- a/includes.h
+++ b/includes.h
@@ -61,7 +61,10 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
# include <maillock.h> /* For _PATH_MAILDIR */
#endif
#ifdef HAVE_NEXT
-# include <libc.h>
+# include <libc.h>
+#endif
+#ifdef HAVE_PATHS
+# include <paths.h>
#endif
#include <unistd.h> /* For STDIN_FILENO, etc */