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@18392 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h
index 3814aa88c9252bbd27dc6b0eb694d63594ee7041..1c4faec5748a6760b7b29c96cd3b54d77269f944 100644 (file)
--- a/src/include/kerberosIV/des.h
+++ b/src/include/kerberosIV/des.h
@@ -51,7 +51,7 @@
 KRBINT_BEGIN_DECLS
 
 #if TARGET_OS_MAC
-#      pragma options align=mac68k
+#      pragma pack(push,2)
 #endif
 
 #if UINT_MAX >= 0xFFFFFFFFUL
@@ -84,7 +84,7 @@ typedef unsigned char des_cblock[8];  /* crypto-block size */
 typedef struct des_ks_struct {  DES_INT32 _[2]; } des_key_schedule[16];
 
 #if TARGET_OS_MAC
-#      pragma options align=reset
+#      pragma pack(pop)
 #endif
 
 KRBINT_END_DECLS
@@ -113,7 +113,7 @@ KRBINT_END_DECLS
 KRBINT_BEGIN_DECLS
 
 #if TARGET_OS_MAC
-#      pragma options align=mac68k
+#      pragma pack(push,2)
 #endif
 
 /* Windows declarations */
@@ -186,7 +186,7 @@ int des_is_weak_key(des_cblock);
 void des_cblock_print_file(des_cblock *, FILE *fp);
 
 #if TARGET_OS_MAC
-#      pragma options align=reset
+#      pragma pack(pop)
 #endif
 
 KRBINT_END_DECLS

diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 6bc7149d775946bf09a1df74fe22a59754651a32..528d78a322a23533ece965ef2c0c414764888804 100644 (file)
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -73,7 +73,7 @@
 KRBINT_BEGIN_DECLS
 
 #if TARGET_OS_MAC
-#      pragma options align=mac68k
+#      pragma pack(push,2)
 #endif
 
 #define KRB4_32                DES_INT32
@@ -779,7 +779,7 @@ long win_time_get_epoch(void);
 #endif
 
 #if TARGET_OS_MAC
-#      pragma options align=reset
+#      pragma pack(pop)
 #endif
 
 KRBINT_END_DECLS

diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 603ed802835f3ea07234c9afcbf0a3d162ec429c..23f93c7a9bacd053deee396e4c0eb5660383142b 100644 (file)
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -109,7 +109,7 @@
 KRB5INT_BEGIN_DECLS
 
 #if TARGET_OS_MAC
-#    pragma options align=mac68k
+#    pragma pack(push,2)
 #endif
 
 /* from profile.h */
@@ -2564,7 +2564,7 @@ krb5_clear_error_message (krb5_context);
 
 
 #if TARGET_OS_MAC
-#    pragma options align=reset
+#    pragma pack(pop)
 #endif
 
 KRB5INT_END_DECLS