Skip to content

Commit

Permalink
Fix(32 bits): Avoid type redefinition
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathias-Boulay committed Nov 23, 2024
1 parent 83373d6 commit 0190182
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions patches/jre_21/android/jdk21u_android.diff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0190182

Please sign in to comment.