From c8aaaa6f8daaed89857315ac5044b45f66100613 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Tue, 1 Sep 1998 19:37:33 +0000 Subject: [PATCH] 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 --- src/lib/krb5/ccache/ccapi/stdcc.h | 9 ++++++++- src/lib/krb5/ccache/ccapi/stdcc_util.h | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h index 4786cb9e2..c157770c4 100644 --- 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 f743d8ea7..7d0af3dcb 100644 --- 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 -- 2.26.2