Add #ifdef's so that correct header file (cacheapi.h vs. Ccache.h) is used

when building under Windows.

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

diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index 4786cb9e228a1093f123032caa95eed6384a30a3..c157770c49673eef1816dc7a93765b5878960cf8 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -1,6 +1,13 @@
 //#include "k5-int.h"
 #include "krb5.h"
+       
+#if defined(macintosh)
 #include "CCache.h"
+#endif
+
+#if defined(_MSDOS) || defined(_WIN32)
+#include "cacheapi.h"
+#endif
 
 #define kStringLiteralLen 255
 
@@ -63,4 +70,4 @@ KRB5_DLLIMP krb5_error_code  krb5_stdcc_set_flags
         KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
 
 KRB5_DLLIMP krb5_error_code  krb5_stdcc_remove 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds));
\ No newline at end of file
+        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds));

diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.h b/src/lib/krb5/ccache/ccapi/stdcc_util.h
index f743d8ea7c5d575447ea70917e004b0be91705e7..7d0af3dcb4ffa52657a2473d8080200d0e66d8cd 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.h
@@ -2,7 +2,14 @@
 // 
 // Frank Dabek, July 1998
 
+#if defined(macintosh)
 #include "CCache.h"
+#endif
+
+#if defined(_MSDOS) || defined(_WIN32)
+#include "cacheapi.h"
+#endif
+
 #include "krb5.h"
 
 //protoypes for private functions declared in stdcc_util.c