Reviewed by Tim O.

        * bindings/npapi.h: do not define #pragma options align=mac68k if we are 64-bit

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3d80f4f5e2353f9dc90c9e973e2b908fe49e15ea..279ffed01c9e83b347721962ab4ad092a735c4b4 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-08  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Tim O.
+
+        * bindings/npapi.h: do not define #pragma options align=mac68k if we are 64-bit
+
 2006-05-07  Darin Adler  <darin@apple.com>
 
         Reviewed and landed by Maciej.

diff --git a/JavaScriptCore/bindings/npapi.h b/JavaScriptCore/bindings/npapi.h
index 1fb482b6feb4dc0b0268de4058888a265ffb303d..7501c81e20133886d0c66a8c9435be8b309b9be4 100644 (file)
--- a/JavaScriptCore/bindings/npapi.h
+++ b/JavaScriptCore/bindings/npapi.h
@@ -153,9 +153,11 @@ typedef char*            NPMIMEType;
 /*             Structures and definitions             */
 /*----------------------------------------------------------------------*/
 
+#if !defined(__LP64__)
 #if defined(XP_MAC) || defined(XP_MACOSX)
 #pragma options align=mac68k
 #endif
+#endif /* __LP64__ */
 
 /*
  *  NPP is a plug-in's opaque instance handle
@@ -445,9 +447,11 @@ typedef struct NP_Port
 
 #define NP_MAXREADY    (((unsigned)(~0)<<1)>>1)
 
+#if !defined(__LP64__)
 #if defined(XP_MAC) || defined(XP_MACOSX)
 #pragma options align=reset
 #endif
+#endif /* __LP64__ */
 
 
 /*----------------------------------------------------------------------*/