From 73bc1937d6d605e275b3b1090a612966252ba4ad Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Tue, 14 Oct 1997 23:00:16 +0000
Subject: [PATCH] fixes after merge

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3613 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kafs/kafs.h      | 2 +-
 lib/kafs/kafs_locl.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/kafs/kafs.h b/lib/kafs/kafs.h
index a7152a900..eb22d9b83 100644
--- a/lib/kafs/kafs.h
+++ b/lib/kafs/kafs.h
@@ -41,7 +41,7 @@
 #ifndef __KAFS_H
 #define __KAFS_H
 
-#include <krb5-types.h>
+/* XXX must include krb5.h or krb.h */
 
 /* sys/ioctl.h must be included manually before kafs.h */
 
diff --git a/lib/kafs/kafs_locl.h b/lib/kafs/kafs_locl.h
index 60ec11d05..40ace1cdd 100644
--- a/lib/kafs/kafs_locl.h
+++ b/lib/kafs/kafs_locl.h
@@ -93,8 +93,12 @@
 #endif
 #include <roken.h>
 
+#ifdef KRB5
 #include <krb5.h>
+#endif
+#ifdef KRB4
 #include <krb.h>
+#endif
 #include <kafs.h>
 
 /* #include <resolve.h> */