From: Alexandra Ellwood <lxs@mit.edu>
Date: Fri, 24 Aug 2007 20:32:28 +0000 (+0000)
Subject: pullup to trunk
X-Git-Tag: krb5-1.7-alpha1~927
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6834c7ab409d8b4aa17684669f26c7d532adf9ed;p=krb5.git

pullup to trunk

ticket: 5643
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19871 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 71b365b0b..ef55febcf 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -39,7 +39,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #if TARGET_OS_MAC
-#	pragma options align=mac68k
+#    pragma pack(push,2)
 #endif
 
 #if defined(_MSDOS) || defined(_WIN32)
@@ -768,7 +768,7 @@ OM_uint32 KRB5_CALLCONV gss_canonicalize_name
 	);
 
 #if TARGET_OS_MAC
-#  pragma options align=reset
+#    pragma pack(pop)
 #endif
 
 #ifdef __cplusplus