* krb5_libinit.c: Removed Mac OS X header goober. Conditionalize CCAPI calls on...

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

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 4d7faca6d434ea53b362ed9a58014cb42c1e3658..06d082f97bef49dc0e4aff31b54b7b6e822a75ce 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-06  Alexandra Ellwood <lxs@mit.edu>
+
+    * krb5_libinit.c: Removed Mac OS X header goober.  Conditionalize
+    CCAPI calls on USE_CCAPI so Darwin builds work.
+
 2003-02-04  Tom Yu  <tlyu@mit.edu>
 
        * 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 e62b44cc04bba1288def6fe9c3c8e1b39e48bc9f..296d957fafda794097a54fa947066af4fcf37d60 100644 (file)
--- a/src/lib/krb5/krb5_libinit.c
+++ b/src/lib/krb5/krb5_libinit.c
@@ -1,14 +1,16 @@
 #include <assert.h>
 
-#if TARGET_OS_MAC
-#    include <Kerberos/com_err.h>
-#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