From: Alexandra Ellwood <lxs@mit.edu>
Date: Tue, 25 Jul 2006 17:56:18 +0000 (+0000)
Subject: Switched from "#pragma options align" to "#pragma pack".
X-Git-Tag: krb5-1.6-alpha1~185
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03ae3190deb5504c3201a425799a6a9ab9db26a9;p=krb5.git

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 3814aa88c..1c4faec57 100644
--- 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 6bc7149d7..528d78a32 100644
--- 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 603ed8028..23f93c7a9 100644
--- 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