diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index af6f6c58a..4bd2c8f46 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -267,7 +267,7 @@
   sz = JCALL1(GetArrayLength, jenv, ba);
   $1 = 0;
   for(i=0; i<sz; i++) {
-    $1 = ($1 << 8) | (unsigned long long)(unsigned char)bae[i];
+    $1 = ($1 << 8) | ($1_type)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
@@ -291,7 +291,7 @@
   sz = JCALL1(GetArrayLength, jenv, ba);
   $1 = 0;
   for(i=0; i<sz; i++) {
-    $1 = ($1 << 8) | (unsigned long long)(unsigned char)bae[i];
+    $1 = ($1 << 8) | ($1_type)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
@@ -496,7 +496,7 @@
   $1 = &temp;
   temp = 0;
   for(i=0; i<sz; i++) {
-    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
+    temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
@@ -522,7 +522,7 @@
   $1 = &temp;
   temp = 0;
   for(i=0; i<sz; i++) {
-    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
+    temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i
index 8e70e3d6f..2b5f49c97 100644
--- a/Lib/java/typemaps.i
+++ b/Lib/java/typemaps.i
@@ -124,7 +124,7 @@ INPUT_TYPEMAP(double, jdouble, double, "D");
   sz = JCALL1(GetArrayLength, jenv, ba);
   temp = 0;
   for(i=0; i<sz; i++) {
-    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
+    temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
   $1 = &temp;
@@ -419,7 +419,7 @@ INOUT_TYPEMAP(double, jdouble, double, Double, "[Ljava/lang/Double;", jdoubleArr
   sz = JCALL1(GetArrayLength, jenv, ba);
   temp = 0;
   for(i=0; i<sz; i++) {
-    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
+    temp = (temp << 8) | ($*1_ltype)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
   $1 = &temp;