* krb5_libinit.c: Added an include for com_err.h since

	it is not included by error table headers on Mac OS X.  Also
	fixed busted check for Mac OS

	* krb5_libinit.c: added #define for Mac OS X so
	that krb5int_cleanup_library calls krb5_stdcc_shutdown.

	[pullups from 1-2-2-branch]

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

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index e9526be9363f0f1e0ada8b24c55031d22b3e29cd..02462c1cc5189f12a89c4fa0f58a9e87edc4dada 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-25 Alexandra Ellwood <lxs@mit.edu>
+
+       * krb5_libinit.c: Added an include for com_err.h since
+       it is not included by error table headers on Mac OS X.  Also
+       fixed busted check for Mac OS
+
+       * krb5_libinit.c: added #define for Mac OS X so
+       that krb5int_cleanup_library calls krb5_stdcc_shutdown.
+
+       [pullups from 1-2-2-branch]
+
 2002-06-09  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Don't set up keytab/file or keytab/srvtab

diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c
index f303046cf6a75f49575e96f6448f2d348a2f9fd5..c50dff187bfe805c527d3ec0c48160120c816738 100644 (file)
--- a/src/lib/krb5/krb5_libinit.c
+++ b/src/lib/krb5/krb5_libinit.c
@@ -1,5 +1,9 @@
 #include <assert.h>
 
+#if TARGET_OS_MAC
+    #include <Kerberos/com_err.h>
+#endif
+
 #include "krb5.h"
 #include "krb5_err.h"
 #include "kv5m_err.h"
@@ -36,7 +40,7 @@ void krb5int_cleanup_library (void)
 {
        assert (initialized);
 
-#if defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || TARGET_OS_MAC
        krb5_stdcc_shutdown();
 #endif