From 75481e2b29e4c0fae99f3411e4701e113241f94e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 30 Oct 2020 16:38:58 +0100
Subject: avoid redefinitions on x86


diff --git a/src/share/vm/libadt/port.hpp b/src/share/vm/libadt/port.hpp
index 358ab30..72c482e 100644
--- a/src/share/vm/libadt/port.hpp
+++ b/src/share/vm/libadt/port.hpp
@@ -180,8 +180,10 @@ typedef unsigned char byte;
 typedef unsigned int uint;      // When you need a fast >=16bit unsigned value
 /*typedef int int; */           // When you need a fast >=16bit value
 const unsigned int max_uint = (uint)-1;
+#ifndef __HAIKU__
 typedef int32_t int32;   // Exactly 32bits signed
 typedef uint32_t uint32; // Exactly 32bits unsigned
+#endif
 
 // Bit-sized floating point and long thingies
 #ifndef __TANDEM
diff --git a/src/share/vm/utilities/globalDefinitions.hpp b/src/share/vm/utilities/globalDefinitions.hpp
index 2659418..3bbd4ff 100644
--- a/src/share/vm/utilities/globalDefinitions.hpp
+++ b/src/share/vm/utilities/globalDefinitions.hpp
@@ -1471,9 +1471,11 @@ inline TYPE NAME (TYPE in1, TYPE in2) {                 \
 JAVA_INTEGER_OP(+, java_add, jint, juint)
 JAVA_INTEGER_OP(-, java_subtract, jint, juint)
 JAVA_INTEGER_OP(*, java_multiply, jint, juint)
+#ifndef __HAIKU__
 JAVA_INTEGER_OP(+, java_add, jlong, julong)
 JAVA_INTEGER_OP(-, java_subtract, jlong, julong)
 JAVA_INTEGER_OP(*, java_multiply, jlong, julong)
+#endif
 
 #undef JAVA_INTEGER_OP
 
-- 
2.28.0

