Fixes for code merge

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3604 ec53bebd-3082-4978-b11e-865c3cabbd6b
1997-10-14 15:16:33 +00:00
parent 42e9239404
commit 1d3d4ada88
6 changed files with 25 additions and 13 deletions
--- a/lib/des/md4.h
+++ b/lib/des/md4.h
@@ -45,11 +45,15 @@
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
+#ifdef KRB5
 #include <krb5-types.h>
+#elif defined(KRB4)
+#include <ktypes.h>
+#endif

 struct md4 {
-  unsigned offset;
-  unsigned sz;
+  unsigned int offset;
+  unsigned int sz;
  u_int32_t counter[4];
  unsigned char save[64];
 };