From 19f15ab2699fcb8f0d1572d6483bdee65e4cdc6f Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood <lxs@mit.edu> Date: Mon, 24 Jul 2006 19:27:04 +0000 Subject: [PATCH] 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 --- src/lib/ccapi/include/CredentialsCache.h | 4 ++-- src/lib/ccapi/include/CredentialsCache2.h | 4 ++-- 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 -- 2.26.2