diff options
| author | Miro Jurisic <meeroh@mit.edu> | 1998-07-14 15:12:49 +0000 |
|---|---|---|
| committer | Miro Jurisic <meeroh@mit.edu> | 1998-07-14 15:12:49 +0000 |
| commit | 9b0a62031ff4b2466bf62fc24353be40ac579085 (patch) | |
| tree | 8f62e3199c953a18805f22f8eb3d3121d20063aa /src | |
| parent | 8ea93aa530d9b07ae9180cb9363f518a3cccb829 (diff) | |
| download | krb5-9b0a62031ff4b2466bf62fc24353be40ac579085.tar.gz krb5-9b0a62031ff4b2466bf62fc24353be40ac579085.tar.xz krb5-9b0a62031ff4b2466bf62fc24353be40ac579085.zip | |
Added magic incantations for Macontosh CFM-68K
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10633 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/k5-int.h | 7 | ||||
| -rw-r--r-- | src/include/krb5.hin | 12 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/gssapi.hin | 10 | ||||
| -rw-r--r-- | src/util/et/com_err.h | 13 |
4 files changed, 39 insertions, 3 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 13da7ee34..268b273c2 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -60,6 +60,9 @@ #if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH) #include "win-mac.h" +#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import on +#endif #endif #if defined(_MSDOS) || defined(_WIN32) @@ -1306,6 +1309,10 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_ser_unpack_bytes krb5_octet FAR * FAR *, size_t FAR *)); +#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import reset +#endif + /* * Convenience function for structure magic number */ diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 3b51bfce0..4150b0797 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -27,8 +27,12 @@ #ifndef KRB5_GENERAL__ #define KRB5_GENERAL__ -#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) -#define _MACINTOSH +#if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH) +#include <win-mac.h> +/* Macintoh CFM-68K magic incantation */ +#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import on +#endif #endif #if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH) @@ -2222,5 +2226,9 @@ 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 #endif /* KRB5_GENERAL__ */ diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin index 1d6e0add0..13da452f9 100644 --- a/src/lib/gssapi/generic/gssapi.hin +++ b/src/lib/gssapi/generic/gssapi.hin @@ -29,6 +29,11 @@ #if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH) #include <win-mac.h> + +/* Macintoh CFM-68K magic incantation */ +#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import on +#endif #endif #ifndef KRB5_CALLCONV @@ -698,4 +703,9 @@ PROTOTYPE( (OM_uint32 *, /* minor_status */ /* XXXX This is a necessary evil until the spec is fixed */ #define GSS_S_CRED_UNAVAIL GSS_S_FAILURE +/* Macintoh CFM-68K magic incantation */ +#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import reset +#endif + #endif /* _GSSAPI_H_ */ diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h index 70d987ecf..636e57cdd 100644 --- a/src/util/et/com_err.h +++ b/src/util/et/com_err.h @@ -20,8 +20,15 @@ #define unix #endif -#if defined(_MSDOS) || defined (_WIN32) +#if defined(__MWERKS__) || defined(applec) || defined(THINK_C) +#define _MACINTOSH +#endif + +#if defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH) #include <win-mac.h> +#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import on +#endif #endif #ifndef KRB5_CALLCONV @@ -101,5 +108,9 @@ extern et_old_error_hook_func reset_com_err_hook } #endif +#if defined(_MACINTOSH) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__) +#pragma import reset +#endif + #define __COM_ERR_H #endif /* ! defined(__COM_ERR_H) */ |