diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-02-07 21:39:44 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-02-07 21:39:44 +0000 |
| commit | f783834660ced3cabc14fdc184f4808606c856a8 (patch) | |
| tree | 56e5ae5a500c70d971aeb7b322b9b033d63b7cc4 /src/include | |
| parent | e8ee901a519d2f5eaf73b3b83dbac41c88d3d34c (diff) | |
| download | krb5-f783834660ced3cabc14fdc184f4808606c856a8.tar.gz krb5-f783834660ced3cabc14fdc184f4808606c856a8.tar.xz krb5-f783834660ced3cabc14fdc184f4808606c856a8.zip | |
Fix ABI divergence between Unix and Mac krb4 libraries in declaration
of krb_err_txt by means of a gross hack.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15165 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/kerberosIV/ChangeLog | 4 | ||||
| -rw-r--r-- | src/include/kerberosIV/krb.h | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index 58eb897b87..6c13b97703 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 9e9a151cef..684f509686 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 *); |