windows-kfw-sdk-20060921

[openafs.git] / src / WINNT / kfw / inc / krb5 / KerberosIV / krb.h

diff --git a/src/WINNT/kfw/inc/krb5/KerberosIV/krb.h b/src/WINNT/kfw/inc/krb5/KerberosIV/krb.h
index a79df13..528d78a 100644 (file)
--- a/src/WINNT/kfw/inc/krb5/KerberosIV/krb.h
+++ b/src/WINNT/kfw/inc/krb5/KerberosIV/krb.h
@@ -34,7 +34,7 @@
  * For MacOS, don't expose prototypes of various private functions.
  * Unfortuantely, they've leaked out everywhere else.
  */
-#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))
+#if defined(__MACH__) && defined(__APPLE__)
 #      include <TargetConditionals.h>
 #      if TARGET_RT_MAC_CFM
 #              error "Use KfM 4.0 SDK headers for CFM compilation."
@@ -73,11 +73,7 @@
 KRBINT_BEGIN_DECLS
 
 #if TARGET_OS_MAC
-#      if defined(__MWERKS__)
-#              pragma import on
-#              pragma enumsalwaysint on
-#      endif
-#      pragma options align=mac68k
+#      pragma pack(push,2)
 #endif
 
 #define KRB4_32                DES_INT32
@@ -783,10 +779,7 @@ long win_time_get_epoch(void);
 #endif
 
 #if TARGET_OS_MAC
-#      if defined(__MWERKS__)
-#              pragma import reset
-#      endif
-#      pragma options align=reset
+#      pragma pack(pop)
 #endif
 
 KRBINT_END_DECLS