From 96345dfe5d95d1993e67463afbe048e12ce6d103 Mon Sep 17 00:00:00 2001 From: Keith Vetter Date: Thu, 20 Apr 1995 20:01:50 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 4 ++++ src/Makefile.in | 1 + src/include/ChangeLog | 4 ++++ src/include/krb5.h | 4 ++++ src/lib/ChangeLog | 4 ++++ src/lib/win_glue.c | 2 +- src/windows/cns/changelo | 7 +++++++ src/windows/cns/cns.c | 2 +- src/windows/cns/krbini.h | 1 + src/windows/cns/tktlist.c | 2 +- 10 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9f8f0fc2c..1ca3ab5df 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 8e2433512..a60b43b22 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 .\wconfig config include\krb5\makefile .\wconfig config lib\makefile diff --git a/src/include/ChangeLog b/src/include/ChangeLog index c6a41934c..6537129a1 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 d06f12173..c1a8323a8 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 f13dfc100..04c7217b1 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 ae4947238..cb67a3626 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 f2843d82a..59f8c88da 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 6d4c6cdad..a93113de7 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 da5aa88b4..4b09b046a 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 198e97bcd..8e5db5395 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" -- 2.26.2