haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libebml: Use standard integer types (#7856)

Browse Source 
Fixes compile issues on x86 with GCC 11
This commit is contained in:
robxnano
2023-02-19 13:50:38 +00:00
committed by GitHub
parent a2fd1f864e
commit c4ee240313
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dev-libs/libebml/patches/libebml-1.4.4.patchset Normal file
View File

@@ -0,0 +1,34 @@
From 9f0839f6e9abdaf1533ae5f0e2752ce40f5be487 Mon Sep 17 00:00:00 2001
From: robxnano <89391914+robxnano@users.noreply.github.com>
Date: Sun, 12 Feb 2023 15:08:24 +0000
Subject: [PATCH] Haiku: Only include SupportDefs.h on x86_gcc2
---
ebml/c/libebml_t.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ebml/c/libebml_t.h b/ebml/c/libebml_t.h
index b124369..a8853f9 100644
--- a/ebml/c/libebml_t.h
+++ b/ebml/c/libebml_t.h
@@ -72,7 +72,7 @@ extern "C" {
typedef uint16_t uint16;
typedef uint8_t uint8;
# endif // __GNUC__
-#elif defined(__BEOS__) || defined(__HAIKU__)
+#elif defined(__BEOS__) || (defined(__HAIKU__) && __GNUC__ == 2)
#include <SupportDefs.h>
#elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */
typedef signed long long int64;
@@ -98,7 +98,7 @@ extern "C" {
typedef uint32_t uint32;
typedef uint16_t uint16;
typedef uint8_t uint8;
-#elif defined(__BEOS__) || defined(__HAIKU__)
+#elif defined(__BEOS__) || (defined(__HAIKU__) && __GNUC__ == 2)
# include <support/SupportDefs.h>
#else // anything else (Linux, BSD, ...)
# include <inttypes.h>
--
2.39.1