bug 345866 - support OJI for Win64. r/sr=jst

js/src/liveconnect/jsj_JSObject.c

@@ -298,7 +298,7 @@ jsj_UnwrapJSObjectWrapper(JNIEnv *jEnv, jobject java_wrapper_obj)
     JSObjectHandle *handle;
 
 #ifndef OJI
-#if JS_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
     handle = (JSObjectHandle*)((*jEnv)->GetLongField(jEnv, java_wrapper_obj, njJSObject_long_internal));
 #else
     handle = (JSObjectHandle*)((*jEnv)->GetIntField(jEnv, java_wrapper_obj, njJSObject_internal));
@@ -317,7 +317,7 @@ jsj_UnwrapJSObjectWrapper(JNIEnv *jEnv, jobject java_wrapper_obj)
     }
     else {
         jclass   cid = (*jEnv)->GetObjectClass(jEnv, java_wrapper_obj);
-#if JS_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
         jfieldID fid = (*jEnv)->GetFieldID(jEnv, cid, "nativeJSObject", "J");
         handle = (JSObjectHandle*)((*jEnv)->GetLongField(jEnv, java_wrapper_obj, fid));
 #else
@@ -1331,7 +1331,7 @@ Java_netscape_javascript_JSObject_finalize(JNIEnv *jEnv, jobject java_wrapper_ob
 
     success = JS_FALSE;
 
-#if JS_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
     handle = (JSObjectHandle *)((*jEnv)->GetLongField(jEnv, java_wrapper_obj, njJSObject_long_internal));
 #else    
     handle = (JSObjectHandle *)((*jEnv)->GetIntField(jEnv, java_wrapper_obj, njJSObject_internal));

js/src/liveconnect/jsjava.h

@@ -56,7 +56,7 @@ JS_BEGIN_EXTERN_C
 #include "jni.h"             /* Java Native Interface */
 #include "jsapi.h"           /* JavaScript engine API */
 
-#if JS_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
 typedef jlong lcjsobject;
 #else
 typedef jint lcjsobject;

js/src/liveconnect/nsISecureLiveconnect.h

@@ -51,7 +51,17 @@
 #include "nsIFactory.h"
 #include "jni.h"
 
+/*
+ * jint is 32 bit, jlong is 64 bit.  So we must consider 64-bit platform.
+ *
+ * http://java.sun.com/j2se/1.4.2/docs/guide/jni/spec/types.html#wp428
+ */
+
+#if JS_BYTES_PER_WORD == 8
+typedef jlong jsobject;
+#else
 typedef jint jsobject;
+#endif /* JS_BYTES_PER_WORD == 8 */
 
 class nsISecureLiveconnect : public nsISupports {
 public:

modules/oji/public/nsIJVMPlugin.h

@@ -114,7 +114,7 @@ public:
 	SpendTime(PRUint32 timeMillis) = 0;
 
 	NS_IMETHOD
-#if PR_BYTES_PER_LONG == 8
+#if PR_BYTES_PER_LONG == 8 || PR_BYTES_PER_WORD == 8
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jlong* obj) = 0;
 #else
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jint* obj) = 0;