2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c30c0e399..e2bedaad8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -264,6 +264,8 @@
    [openbsd-compat/glob.c openbsd-compat/mktemp.c]
    [openbsd-compat/readpassphrase.c] Lots of include fixes for
    OpenSolaris
+ - (tim) [includes.h] put sys/stat.h back in to quiet some "macro redefined:"
+   warnings.
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4165,4 +4167,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.4218 2006/03/15 03:42:54 djm Exp $
+$Id: ChangeLog,v 1.4219 2006/03/15 05:04:18 tim Exp $
diff --git a/includes.h b/includes.h
index 431fa2d13..c9f6f3723 100644
--- a/includes.h
+++ b/includes.h
@@ -110,6 +110,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_SYS_CDEFS_H
 # include <sys/cdefs.h> /* For __P() */
 #endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h> /* For S_* constants and macros */
+#endif
 #ifdef HAVE_SYS_SYSMACROS_H
 # include <sys/sysmacros.h> /* For MIN, MAX, etc */
 #endif