Skip to content

Commit 0190182

Browse files
Fix(32 bits): Avoid type redefinition
1 parent 83373d6 commit 0190182

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

patches/jre_21/android/jdk21u_android.diff

+7
Original file line numberDiff line numberDiff line change
@@ -2398,6 +2398,13 @@ index 9371bc001..ab7dd0fc0 100644
23982398
#endif
23992399
if (err == -1) {
24002400
throwUnixException(env, errno);
2401+
@@ -80,5 +80,5 @@
2402+
// not relying on included headers.
2403+
2404+
-#ifndef __GLIBC__
2405+
+#if !defined(__GLIBC__) && !defined(__ANDROID__)
2406+
// Alpine doesn't know these types, define them
2407+
typedef unsigned int __uint32_t;
24012408
diff --git a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c b/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
24022409
index b2dedca35..c01ccfb8d 100644
24032410
--- a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c

0 commit comments

Comments
 (0)