From 019018227f2735b6ba1b1f99c969b7fbde47a431 Mon Sep 17 00:00:00 2001 From: Mathias-Boulay Date: Sat, 23 Nov 2024 23:00:07 +0100 Subject: [PATCH] Fix(32 bits): Avoid type redefinition --- patches/jre_21/android/jdk21u_android.diff | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/patches/jre_21/android/jdk21u_android.diff b/patches/jre_21/android/jdk21u_android.diff index 77ca7577..d4312790 100644 --- a/patches/jre_21/android/jdk21u_android.diff +++ b/patches/jre_21/android/jdk21u_android.diff @@ -2398,6 +2398,13 @@ index 9371bc001..ab7dd0fc0 100644 #endif if (err == -1) { throwUnixException(env, errno); +@@ -80,5 +80,5 @@ + // not relying on included headers. + +-#ifndef __GLIBC__ ++#if !defined(__GLIBC__) && !defined(__ANDROID__) + // Alpine doesn't know these types, define them + typedef unsigned int __uint32_t; diff --git a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c b/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c index b2dedca35..c01ccfb8d 100644 --- a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c