From: Keith Vetter <keithv@fusion.com>
Date: Wed, 22 Mar 1995 22:24:07 +0000 (+0000)
Subject: PC config changes due to changes in include sys/types.h
X-Git-Tag: krb5-1.0-beta5~498
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e699d53788c76ca2f7d716e740b89a228e729943;p=krb5.git

PC config changes due to changes in include sys/types.h

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index ed7c72264..394b89ee9 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 22 11:37:24 1995 Keith Vetter (keithv@fusion.com)
+
+	* k5-config.h: added HAVE_SYS_TYPES_H. Cleaned up the loading
+           of sys/types.h which john added earlier. Specifically, we always
+           have it and it's missing some typedefs used by this code.            
+
 Tue Mar 21 18:42:23 1995 Keith Vetter (keithv@fusion.com)
 
 	* k5-config.h: PC: NO_PASSWORD defined and files opened in binary mode.
diff --git a/src/include/krb5/k5-config.h b/src/include/krb5/k5-config.h
index fdfd3121d..080440fe6 100644
--- a/src/include/krb5/k5-config.h
+++ b/src/include/krb5/k5-config.h
@@ -57,36 +57,20 @@
 #define HAS_VOID_TYPE
 #define KRB5_PROVIDE_PROTOTYPES
 #define HAVE_STDARG_H
+#define HAVE_SYS_TYPES_H
 
 #ifndef _SIZE_T_DEFINED
 typedef unsigned int size_t;
 #define _SIZE_T_DEFINED
 #endif 
 
-/* FIXME, Keith!  I'm not sure how it ever worked.
-   Typedeffing u_long and u_char twice will break.  Please eliminate either
-   the DOS-only _U_TYPES_DEFINED stuff, or the HAVE_SYS_TYPES_H stuff in
-   the DOS section of this file.  The KRB5_SYSTYPES section below was
-   previously in ../krb5.h, but I moved it into k5-config.h because
-   there was an interaction on Unix needing <sys/types.h> before
-   defining the networking include files in k5-config.h.  */
-#ifndef _U_TYPES_DEFINED
-typedef unsigned long u_long;
-typedef unsigned char u_char;
-#define _U_LONG_DEFINED
-#endif 
-
 #ifndef KRB5_SYSTYPES__
 #define KRB5_SYSTYPES__
-
-#ifdef HAVE_SYS_TYPES_H		/* From autoconf.h */
 #include <sys/types.h>
-#else /* HAVE_SYS_TYPES_H */
-typedef unsigned long 	u_long;
+typedef unsigned long u_long;      /* Not part of sys/types.h on the pc */
 typedef unsigned int	u_int;
 typedef unsigned short	u_short;
 typedef unsigned char	u_char;
-#endif /* HAVE_SYS_TYPES_H */
 #endif /* KRB5_SYSTYPES__ */
 
 #ifndef INTERFACE