summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorMiro Jurisic <meeroh@mit.edu>1998-07-14 15:12:49 +0000
committerMiro Jurisic <meeroh@mit.edu>1998-07-14 15:12:49 +0000
commit9b0a62031ff4b2466bf62fc24353be40ac579085 (patch)
tree8f62e3199c953a18805f22f8eb3d3121d20063aa /src/include
parent8ea93aa530d9b07ae9180cb9363f518a3cccb829 (diff)
downloadkrb5-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/include')
-rw-r--r--src/include/k5-int.h7
-rw-r--r--src/include/krb5.hin12
2 files changed, 17 insertions, 2 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__ */