Changes for the PC due to tytso's changing the include structure

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

10 files changed, 28 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f8f0fc2c8..1ca3ab5dfe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 20 12:45:07 1995 Keith Vetter (keithv@fusion.com)
+
+	* Makefile.in: bug that makefiles were always being reconfigured.
+
 Wed Apr 19 18:32:04 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: 
diff --git a/src/Makefile.in b/src/Makefile.in
index 8e24335120..a60b43b22a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -138,6 +138,7 @@ makefile-windows:: wconfig.exe config\pre.in config\post.in \
 		lib\krb5\os\makefile.in lib\krb5\posix\makefile.in \
 		lib\krb5\rcache\makefile.in \
 		util\et\makefile.in
+	copy makefile.in makefile
 	.\wconfig config <include\makefile.in >include\makefile
 	.\wconfig config <include\krb5\makefile.in >include\krb5\makefile
 	.\wconfig config <lib\makefile.in >lib\makefile
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index c6a41934c4..6537129a11 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 20 12:15:54 1995 Keith Vetter (keithv@fusion.com)
+
+	* krb5.h: Needs SIZEOF_INT, SIZEOF_LONG defined for the PC.
+
 Wed Apr 29 10:00:00 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: duplicated the file copying stuff from 
diff --git a/src/include/krb5.h b/src/include/krb5.h
index d06f121734..c1a8323a86 100644
--- a/src/include/krb5.h
+++ b/src/include/krb5.h
@@ -33,6 +33,10 @@
 #endif
 
 #ifdef _MSDOS
+
+#define SIZEOF_INT      2
+#define SIZEOF_LONG     4
+
 #ifndef KRB5_CONFIG__
 #define KRB5_PROVIDE_PROTOTYPES
 #define HAS_VOID_TYPE
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index f13dfc1001..04c7217b13 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 20 12:16:50 1995 Keith Vetter (keithv@fusion.com)
+
+	* win_glue.c: include k5-int.h instead of krb5.h.
+
 Mon Apr 17 17:47:07 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: forgot about the rule to make gssapi.lib on the PC.
diff --git a/src/lib/win_glue.c b/src/lib/win_glue.c
index ae49472383..cb67a3626c 100644
--- a/src/lib/win_glue.c
+++ b/src/lib/win_glue.c
@@ -11,7 +11,7 @@
 
 /* We can't include winsock.h directly because of /Za (stdc) options */
 #define NEED_SOCKETS
-#include "krb5.h"
+#include "k5-int.h"
 
 int
 win_socket_initialize()
diff --git a/src/windows/cns/changelo b/src/windows/cns/changelo
index f2843d82a4..59f8c88dad 100644
--- a/src/windows/cns/changelo
+++ b/src/windows/cns/changelo
@@ -1,3 +1,10 @@
+Thu Apr 20 12:17:34 1995 Keith Vetter (keithv@fusion.com)
+
+	* cns.c, tktlist.c, krbini.h: Fixed up #include so it
+	   it only relies on krb5.h. We now include winsock 
+	   ourselves and we needed to pull one constant out of
+	   k5-config.h (INI_KRB_CCACHE).
+
 Tue Apr 18 16:19:07 1995 Keith Vetter (keithv@fusion.com)
 
 	* makefile: better compile flags.
diff --git a/src/windows/cns/cns.c b/src/windows/cns/cns.c
index 6d4c6cdad2..a93113de78 100644
--- a/src/windows/cns/cns.c
+++ b/src/windows/cns/cns.c
@@ -34,7 +34,7 @@
 #endif
 
 #ifdef KRB5
-	#define	NEED_SOCKETS
+	#include "winsock.h"
 	#include "krb5.h"
 	#include "krbini.h"
 	#include "com_err.h"
diff --git a/src/windows/cns/krbini.h b/src/windows/cns/krbini.h
index da5aa88b4c..4b09b046a0 100644
--- a/src/windows/cns/krbini.h
+++ b/src/windows/cns/krbini.h
@@ -21,3 +21,4 @@
 #define DEF_KRB_REALMS  "krb.rea"         /* Default name for krb.realms file */
 #define INI_RECENT_LOGINS "Recent Logins"    
 #define INI_LOGIN       "Login"
+#define INI_KRB_CCACHE  "krb5cc"       	/* From k5-config.h */
diff --git a/src/windows/cns/tktlist.c b/src/windows/cns/tktlist.c
index 198e97bcdd..8e5db53958 100644
--- a/src/windows/cns/tktlist.c
+++ b/src/windows/cns/tktlist.c
@@ -26,7 +26,7 @@
 #endif
 
 #ifdef KRB5
-	#define	NEED_SOCKETS
+	#include "winsock.h"
 	#include "krb5.h"
     #include "com_err.h"