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

diff --git a/src/lib/ccapi/include/CredentialsCache.h b/src/lib/ccapi/include/CredentialsCache.h
index baad48fe7a908ebe09f6ad8b0e53dbf1791439e8..aa800bd2f56a06e7da17931c56dc9ea979c64776 100644 (file)
--- 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 b7366273dd1940157e5d5180f41b3679c21c6b9d..04b9396c729f639388e21bd9aa8371b6898538a0 100644 (file)
--- 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