From 42a93b0f1d60170561b21fc95c93908b288e9aa5 Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@toad.com>
Date: Fri, 3 Mar 1995 07:26:41 +0000
Subject: [PATCH] Make include files start to work on the Macintosh

* configure.in:  Add checks for sys/types.h and sys/stat.h.
* k5-config.h:  Remove krb5/ from #include.
* sysincl.h:  Avoid <sys/types.h>.  Conditional-include <sys/stat.h>.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5069 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/krb5/ChangeLog    | 8 ++++++++
 src/include/krb5/configure.in | 2 ++
 src/include/krb5/k5-config.h  | 2 +-
 src/include/krb5/sysincl.h    | 7 ++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 149a182b1..fa501a7a7 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar  2 23:21:46 1995  John Gilmore  (gnu at toad.com)
+
+	Make include files start to work on the Macintosh.
+
+	* configure.in:  Add checks for sys/types.h and sys/stat.h.
+	* k5-config.h:  Remove krb5/ from #include.
+	* sysincl.h:  Avoid <sys/types.h>.  Conditional-include <sys/stat.h>.
+
 Thu Mar 2 13:30:00 1995 Keith Vetter (keithv@fusion.com)
 
 	* k5-config.h: changed NEED_WINSOCK_H to NEED_SOCKETS
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index 7182e2f54..afbf44b52 100644
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -43,8 +43,10 @@ dnl
 dnl
 AC_HEADER_CHECK(string.h,AC_DEFINE(USE_STRING_H))
 AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H),AC_DEFINE(NO_STDLIB_H))
+AC_CHECK_HEADERS(sys/types.h)
 AC_CHECK_HEADERS(sys/file.h)
 AC_CHECK_HEADERS(sys/param.h)
+AC_CHECK_HEADERS(sys/stat.h)
 CHECK_STDARG
 
 AC_FUNC_CHECK([setvbuf],AC_DEFINE(HAS_SETVBUF))
diff --git a/src/include/krb5/k5-config.h b/src/include/krb5/k5-config.h
index 117ed87ec..340bf7740 100644
--- a/src/include/krb5/k5-config.h
+++ b/src/include/krb5/k5-config.h
@@ -90,7 +90,7 @@ typedef unsigned char u_char;
 
 #ifndef KRB5_AUTOCONF__
 #define KRB5_AUTOCONF__
-#include "krb5/autoconf.h"
+#include "autoconf.h"
 #endif
 
 #ifdef SYSV
diff --git a/src/include/krb5/sysincl.h b/src/include/krb5/sysincl.h
index 38f691c8e..3800d9ecf 100644
--- a/src/include/krb5/sysincl.h
+++ b/src/include/krb5/sysincl.h
@@ -30,7 +30,8 @@
 
 #ifndef KRB5_SYSTYPES__
 #define KRB5_SYSTYPES__
-#include <sys/types.h>			/* needed for much of the reset */
+/* needed for much of the rest -- but already handled in krb5.h? */
+/* #include <sys/types.h> */
 #endif /* KRB5_SYSTYPES__ */
 
 #include "osconf.h"			/* USE*TIME_H macros */
@@ -42,7 +43,11 @@
 #else
 #include <time.h>
 #endif
+
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>			/* struct stat, stat() */
+#endif
+
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>			/* MAXPATHLEN */
 #endif
-- 
2.26.2