diff options
| author | Miro Jurisic <meeroh@mit.edu> | 1999-07-21 18:23:24 +0000 |
|---|---|---|
| committer | Miro Jurisic <meeroh@mit.edu> | 1999-07-21 18:23:24 +0000 |
| commit | 1fdb19d378e26fca9d6e47928c1857312923661e (patch) | |
| tree | 5358c5a72807fe3ead4ce67642016f2ee1c3238d /src/include | |
| parent | 0bd11fd25b1d7b9f50049dcc635878cbee5c55c1 (diff) | |
| download | krb5-1fdb19d378e26fca9d6e47928c1857312923661e.tar.gz krb5-1fdb19d378e26fca9d6e47928c1857312923661e.tar.xz krb5-1fdb19d378e26fca9d6e47928c1857312923661e.zip | |
#ifdefed out krb5_*config_file on MacOS
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11570 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/krb5.hin | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index aca43d257..8adfca813 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,9 @@ +1999-07-21 Miro Jurisic <meeroh@.mit.edu> + + * krb5.hin: #ifdefed out krb5_set_config_files, + krb5_get_default_config_files, and krb5_free_confilg_files + on the Mac + 1999-06-16 Danilo Almeida <dalmeida@mit.edu> * krb5.hin (krb5_get_default_config_files, krb5_free_config_files): diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 91091a8b1..e11257b1d 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -1820,6 +1820,7 @@ krb5_change_password int *result_code, krb5_data *result_code_string, krb5_data *result_string)); +#ifndef macintosh krb5_error_code krb5_set_config_files KRB5_PROTOTYPE ((krb5_context, krb5_const char FAR * FAR *)); @@ -1829,6 +1830,8 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_default_config_files KRB5_DLLIMP void KRB5_CALLCONV krb5_free_config_files KRB5_PROTOTYPE((char **filenames)); +#endif + krb5_error_code krb5_secure_config_files KRB5_PROTOTYPE ((krb5_context)); @@ -2387,11 +2390,6 @@ KRB5_PROTOTYPE((krb5_context context, krb5_ccache ccache, char *in_tkt_service)); -/* Macintoh CFM-68K magic incantation */ -#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) -#pragma import reset -#endif - /* * The realm iterator functions */ @@ -2415,5 +2413,10 @@ KRB5_DLLIMP void KRB5_CALLCONV krb5_free_realm_string } #endif +/* Macintoh CFM-68K magic incantation */ +#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import reset +#endif + #endif /* KRB5_GENERAL__ */ |