--- a/jdk/src/share/native/sun/security/jgss/wrapper/gssapi.h	Mon May 06 21:24:37 2013 -0700
+++ b/jdk/src/share/native/sun/security/jgss/wrapper/gssapi.h	Tue May 07 12:30:36 2013 +0800
@@ -32,10 +32,21 @@
 #ifndef _GSSAPI_H_
 #define _GSSAPI_H_
 
+#if defined(__MACH__) && defined(__APPLE__)
+#       include <TargetConditionals.h>
+#       if TARGET_RT_MAC_CFM
+#               error "Use KfM 4.0 SDK headers for CFM compilation."
+#       endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+#if TARGET_OS_MAC
+#    pragma pack(push,2)
+#endif
+
 /*
  * First, include stddef.h to get size_t defined.
  */
@@ -671,6 +682,10 @@
         gss_name_t *            /* output_name */
 );
 
+#if TARGET_OS_MAC
+#    pragma pack(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif