mirror of
https://github.com/AngelAuraMC/angelauramc-openjdk-build.git
synced 2025-09-10 12:47:00 -04:00
Fix(32 bits): Avoid type redefinition
This commit is contained in:
parent
95c88f97f1
commit
e66dcf8c37
@ -2398,6 +2398,13 @@ index 9371bc001..ab7dd0fc0 100644
|
|||||||
#endif
|
#endif
|
||||||
if (err == -1) {
|
if (err == -1) {
|
||||||
throwUnixException(env, errno);
|
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
|
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
|
index b2dedca35..c01ccfb8d 100644
|
||||||
--- a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
|
--- a/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
|
||||||
|
Loading…
x
Reference in New Issue
Block a user