Index: modules/oji/public/nsIJVMPlugin.h
===================================================================
RCS file: /cvsroot/mozilla/modules/oji/public/nsIJVMPlugin.h,v
retrieving revision 1.22
diff -d -u -p -r1.22 nsIJVMPlugin.h
--- modules/oji/public/nsIJVMPlugin.h	27 Jul 2006 16:51:25 -0000	1.22
+++ modules/oji/public/nsIJVMPlugin.h	21 Mar 2008 16:54:19 -0000
@@ -51,6 +51,7 @@
 #include "nsISupports.h"
 #include "nsIPrincipal.h"
 #include "jni.h"
+#include "jstypes.h"
 
 class nsISecureEnv;
 
@@ -90,7 +91,7 @@ public:
 	GetClassPath(const char* *result) = 0;
 
 	NS_IMETHOD
-#if PR_BYTES_PER_LONG == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
 	GetJavaWrapper(JNIEnv* jenv, jlong obj, jobject *jobj) = 0;
 #else
 	GetJavaWrapper(JNIEnv* jenv, jint obj, jobject *jobj) = 0;
@@ -114,7 +115,7 @@ public:
 	SpendTime(PRUint32 timeMillis) = 0;
 
 	NS_IMETHOD
-#if PR_BYTES_PER_LONG == 8 || PR_BYTES_PER_WORD == 8
+#if JS_BYTES_PER_LONG == 8 || JS_BYTES_PER_WORD == 8
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jlong* obj) = 0;
 #else
 	UnwrapJavaWrapper(JNIEnv* jenv, jobject jobj, jint* obj) = 0;