From b678e70003cc2c84df426bb63a07f43e508604bf Mon Sep 17 00:00:00 2001 From: Brian Burkhalter <bpb@openjdk.org> Date: Tue, 24 Jan 2023 20:32:46 +0000 Subject: [PATCH] 8300942: JDK-8299684 breaks x86 build Reviewed-by: dholmes, jiefu --- test/jdk/java/nio/jni/libNewDirectByteBuffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/jdk/java/nio/jni/libNewDirectByteBuffer.c b/test/jdk/java/nio/jni/libNewDirectByteBuffer.c index 3aec0713ad1..4b912c5cd08 100644 --- a/test/jdk/java/nio/jni/libNewDirectByteBuffer.c +++ b/test/jdk/java/nio/jni/libNewDirectByteBuffer.c @@ -20,6 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ +#include <stdint.h> #include <stdlib.h> #include "jni.h" @@ -30,7 +31,7 @@ Java_NewDirectByteBuffer_newDirectByteBuffer { // Create the direct byte buffer, freeing the native memory if an exception // is thrown while constructing the buffer - return (*env)->NewDirectByteBuffer(env, (void*)addr, size); + return (*env)->NewDirectByteBuffer(env, (void*)(uintptr_t)addr, size); } // private static native long getDirectByteBufferCapacity(ByteBuffer buf) @@ -46,5 +47,5 @@ JNIEXPORT jlong JNICALL Java_NewDirectByteBuffer_getDirectBufferAddress (JNIEnv *env, jclass cls, jobject buf) { - return (jlong)(*env)->GetDirectBufferAddress(env, buf); + return (jlong)(uintptr_t)(*env)->GetDirectBufferAddress(env, buf); }