Make include files begin to work on the Macintosh

* k5-int.h:  Remove krb5/ from #includes.  Rearrange #includes
so that time_t is defined before kdb.h is included.
* krb5.h:  Include k5-config.h first, so its #define's can
control the rest of the file.  If <sys/types.h> is not present,
define u_long, etc, manually.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5070 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 71dbb7977388c4da1e9c0db8cce00d24980d094e..65a643f8ba850ed700f32bc6e199f9ed3cdd9a87 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,13 @@
+Thu Mar  2 23:24:00 1995  John Gilmore  (gnu at toad.com)
+
+       Make include files begin to work on the Macintosh.
+
+       * k5-int.h:  Remove krb5/ from #includes.  Rearrange #includes
+       so that time_t is defined before kdb.h is included.
+       * krb5.h:  Include k5-config.h first, so its #define's can
+       control the rest of the file.  If <sys/types.h> is not present,
+       define u_long, etc, manually.
+
 Wed Feb 22 18:31:12 1995  John Gilmore  (gnu at toad.com)
 
        * k5-int.h:  Remove commented-out <widen.h> and <narrow.h>.

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 4580abbf06628a69210e11344b6ada650dc79000..25556d7899d71166449c200d3e8438bbd350ffa6 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -12,20 +12,18 @@
 /* krb5/krb5.h includes many other krb5/*.h files too.  The ones that it
    doesn't include, we include below.  */
 
-#include "krb5/adm_defs.h"
-#include "krb5/asn1.h"
-#include "krb5/copyright.h"
-/* #include "krb5/crc-32.h" -- removed from krb5 to lib/crypto/crc32 */
-#include "krb5/dbm.h"
-#include "krb5/ext-proto.h"
-#include "krb5/kdb.h"
-#include "krb5/kdb_dbm.h"
-#include "krb5/libos.h"
-#include "krb5/los-proto.h"
-#include "krb5/mit-des.h"
-#include "krb5/preauth.h"
-/* #include "krb5/rsa-md4.h" -- removed from krb5 to lib/crypto/md4 */
-#include "krb5/rsa-md5.h"
-/* #include "krb5/stock" */
-#include "krb5/sysincl.h"
+#include "adm_defs.h"
+#include "asn1.h"
+#include "copyright.h"
+#include "dbm.h"
+#include "ext-proto.h"
+/* Needed to define time_t for kdb.h prototypes.  */
+#include "sysincl.h"
+#include "los-proto.h"
+#include "kdb.h"
+#include "kdb_dbm.h"
+#include "libos.h"
+#include "mit-des.h"
+#include "preauth.h"
+#include "rsa-md5.h"
 /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */

diff --git a/src/include/krb5.h b/src/include/krb5.h
index 4452f955642de7f0ac9137a69fb446ee3cdebfb8..865140201953408de7c22a2c931ae40539502ffd 100644 (file)
--- a/src/include/krb5.h
+++ b/src/include/krb5.h
@@ -27,13 +27,21 @@
 #ifndef KRB5_GENERAL__
 #define KRB5_GENERAL__
 
+#include "k5-config.h"
+
 #ifndef KRB5_SYSTYPES__
 #define KRB5_SYSTYPES__
+
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#else /* HAVE_SYS_TYPES_H */
+typedef unsigned long  u_long;
+typedef unsigned int   u_int;
+typedef unsigned short u_short;
+typedef unsigned char  u_char;
+#endif /* HAVE_SYS_TYPES_H */
 #endif /* KRB5_SYSTYPES__ */
 
-#include "k5-config.h"
-
 #include "base-defs.h"
 #include "hostaddr.h"