summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/kerberosIV/ChangeLog4
-rw-r--r--src/include/kerberosIV/krb.h7
2 files changed, 11 insertions, 0 deletions
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 58eb897b8..6c13b9770 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-07 Tom Yu <tlyu@mit.edu>
+
+ * krb.h: Declare krb_err_txt differently on Mac.
+
2003-01-16 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (all-unix, install): Build and install kadm_err.h.
diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 9e9a151ce..684f50968 100644
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -74,7 +74,13 @@ KRBINT_BEGIN_DECLS
#define KRB_UINT32 DES_UINT32
#define MAX_KRB_ERRORS 256
+
+#if TARGET_OS_MAC
+/* ABI divergence on Mac for backwards compatibility. */
extern const char * const * const krb_err_txt;
+#else
+extern const char * const krb_err_txt[MAX_KRB_ERRORS];
+#endif
/* General definitions */
#define KSUCCESS 0
@@ -655,6 +661,7 @@ int send_to_kdc
/* Used to return pointer to non-const char */
const char * KRB5_CALLCONV tkt_string
(void);
+/* Previously not KRB5_CALLCONV */
void KRB5_CALLCONV krb_set_tkt_string
(char *);