From de6eaa109a0f0c5b1476becc00200a018e599a5c Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Thu, 6 Mar 2003 20:55:35 +0000 Subject: [PATCH] * krb5_libinit.c: Removed Mac OS X header goober. Conditionalize CCAPI calls on USE_CCAPI so Darwin builds work git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15255 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/ChangeLog | 5 +++++ src/lib/krb5/krb5_libinit.c | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index 4d7faca6d..06d082f97 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,8 @@ +2003-03-06 Alexandra Ellwood + + * krb5_libinit.c: Removed Mac OS X header goober. Conditionalize + CCAPI calls on USE_CCAPI so Darwin builds work. + 2003-02-04 Tom Yu * configure.in: Add KRB5_SIGTYPE and CHECK_SIGNALS for diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c index e62b44cc0..296d957fa 100644 --- a/src/lib/krb5/krb5_libinit.c +++ b/src/lib/krb5/krb5_libinit.c @@ -1,14 +1,16 @@ #include -#if TARGET_OS_MAC -# include -#endif - +#include "com_err.h" #include "krb5.h" #include "krb5_err.h" #include "kv5m_err.h" #include "asn1_err.h" #include "kdb5_err.h" + +#if defined(_WIN32) || defined(USE_CCAPI) +#include "stdcc.h" +#endif + #include "krb5_libinit.h" static int initialized = 0; @@ -42,7 +44,7 @@ void krb5int_cleanup_library (void) { assert (initialized); -#if defined(_WIN32) || TARGET_OS_MAC +#if defined(_WIN32) || defined(USE_CCAPI) krb5_stdcc_shutdown(); #endif -- 2.26.2