summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexandra Ellwood <lxs@mit.edu>2006-07-24 19:27:04 +0000
committerAlexandra Ellwood <lxs@mit.edu>2006-07-24 19:27:04 +0000
commit19f15ab2699fcb8f0d1572d6483bdee65e4cdc6f (patch)
treeb976438e02c3a8e2be7fb1b6d155e1ff1761f168 /src
parente3aa436cc8b1eab7ef67f15ec17aa4bf8310dca7 (diff)
downloadkrb5-19f15ab2699fcb8f0d1572d6483bdee65e4cdc6f.tar.gz
krb5-19f15ab2699fcb8f0d1572d6483bdee65e4cdc6f.tar.xz
krb5-19f15ab2699fcb8f0d1572d6483bdee65e4cdc6f.zip
Switched from "#pragma options align" to "#pragma pack".
Removed Metrowerks "#pragma import" since other framework headers don't specify it. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18380 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/ccapi/include/CredentialsCache.h4
-rw-r--r--src/lib/ccapi/include/CredentialsCache2.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ccapi/include/CredentialsCache.h b/src/lib/ccapi/include/CredentialsCache.h
index baad48fe7..aa800bd2f 100644
--- a/src/lib/ccapi/include/CredentialsCache.h
+++ b/src/lib/ccapi/include/CredentialsCache.h
@@ -71,7 +71,7 @@ extern "C" {
#endif /* __cplusplus */
#if TARGET_OS_MAC
-#pragma options align=mac68k
+#pragma pack(push,2)
#endif
#if defined(_WIN32)
@@ -574,7 +574,7 @@ CCACHE_API cc_int32 cc_initialize (cc_context_t *out_context,
((iterator) -> functions -> clone (iterator, new_iter))
#if TARGET_OS_MAC
-#pragma options align=reset
+#pragma pack(pop)
#endif
#ifdef __cplusplus
diff --git a/src/lib/ccapi/include/CredentialsCache2.h b/src/lib/ccapi/include/CredentialsCache2.h
index b7366273d..04b9396c7 100644
--- a/src/lib/ccapi/include/CredentialsCache2.h
+++ b/src/lib/ccapi/include/CredentialsCache2.h
@@ -59,7 +59,7 @@ extern "C" {
#endif /* __cplusplus */
#if TARGET_OS_MAC
-#pragma options align=mac68k
+#pragma pack(push,2)
#endif
/* Some old types get directly mapped to new types */
@@ -300,7 +300,7 @@ CCACHE_API cc_int32 cc_lock_request(
const cc_int32 lock_type);
#if TARGET_OS_MAC
-#pragma options align=reset
+#pragma pack(pop)
#endif
#ifdef __cplusplus