From c961106dc72a63290be93976745cd2764d87e1b5 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sun, 14 Jul 2002 22:42:33 +0000 Subject: [PATCH] * gss_libinit.c: Conditionalized error table loading for Mac OS X. Error tables should always be loaded on other platforms. * gss_libinit.c: updated for Mac OS X header paths and added include of gssapiP_krb5.h to get function prototypes. [pullups from 1-2-2-branch] git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14647 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/ChangeLog | 10 ++++++++++ src/lib/gssapi/gss_libinit.c | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index eed5015a2..3dcb4207b 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,13 @@ +2002-07-14 Alexandra Ellwood + + * gss_libinit.c: Conditionalized error table loading for Mac OS X. + Error tables should always be loaded on other platforms. + + * gss_libinit.c: updated for Mac OS X header paths and added + include of gssapiP_krb5.h to get function prototypes. + + [pullups from 1-2-2-branch] + 2001-09-01 Ken Raeburn * Makefile.in (SRCS): Use $(srcdir) not $(subdir). diff --git a/src/lib/gssapi/gss_libinit.c b/src/lib/gssapi/gss_libinit.c index 53401c536..88e89bbe4 100644 --- a/src/lib/gssapi/gss_libinit.c +++ b/src/lib/gssapi/gss_libinit.c @@ -1,5 +1,10 @@ #include +#if TARGET_OS_MAC +/* Mac OS X com_err files do not include com_err for you */ +#include +#endif + #include "gssapi_err_generic.h" #include "gssapi_err_krb5.h" #include "gssapiP_krb5.h" @@ -16,8 +21,10 @@ OM_uint32 gssint_initialize_library (void) { if (!initialized) { +#if !TARGET_OS_MAC || USE_HARDCODED_FALLBACK_ERROR_TABLES add_error_table(&et_k5g_error_table); add_error_table(&et_ggss_error_table); +#endif initialized = 1; } -- 2.26.2