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 71b365b0b0495d7702383e14a42197653a90ecf7..ef55febcfc80c9c7a7cae14d7cbd0ceb132edfaf 100644 (file)
--- 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