#include "osconf.h" all the time, at the beginning of the file

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index ca31faff0f7b3c521e23def3abeaa800f13ea3d8..15dff6e76600c55e0e263ce0ea4f5a9ff5fa618f 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 29 01:35:50 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * k5-int.h: #include "osconf.h" all the time, at the beginning of
+               the file.
+
 Tue Sep 26 15:18:26 1995    <tytso@rsts-11.mit.edu>
 
        * k5-int.h: Don't predefine symbols to stop kdb.h and kdb_dbm.h

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 314f618f3f8fa6de8732f7ef6931325afe230eff..9b737642f2ca56909177324b2e2fb10777c04d4f 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -46,6 +46,8 @@
 #ifndef _KRB5_INT_H
 #define _KRB5_INT_H
 
+#include "osconf.h"
+
 /*
  * Begin "k5-config.h"
  */
@@ -500,8 +502,6 @@ typedef krb5_etype_info_entry ** krb5_etype_info;
  */
 #if !defined(_MACINTOSH) && !defined(_MSDOS)
 
-#include "osconf.h"
-
 #ifndef ODBM
 #include <ndbm.h>
 #else /* ODBM */
@@ -590,7 +590,6 @@ extern char *strdup KRB5_PROTOTYPE((const char *));
 /* #include <sys/types.h> */
 #endif /* KRB5_SYSTYPES__ */
 
-#include "osconf.h"                    /* USE*TIME_H macros */
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #ifdef TIME_WITH_SYS_TIME