--- a/hotspot/src/cpu/x86/vm/jni_x86.h	Wed Dec 24 13:06:09 2008 -0800
+++ b/hotspot/src/cpu/x86/vm/jni_x86.h	Wed Dec 24 19:13:53 2008 -0800
@@ -32,7 +32,13 @@
   #define JNICALL
 
   typedef int jint;
+
+#ifdef _LP64
+  typedef long jlong;
+#else
   typedef long long jlong;
+#endif
+
 #else
   #define JNIEXPORT __declspec(dllexport)
   #define JNIIMPORT __declspec(dllimport)