libebml: restore patch that is still needed.

* Was removed when upgrading to 1.3.1, and the lib itself still builds,
but then all apps using it will fail to compile.
This commit is contained in:
Adrien Destugues
2015-04-25 17:02:25 +02:00
parent b839ce896c
commit ff4d0166e2
2 changed files with 43 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
From dfad87a8cda696eba7c4a96ab898705978a0cec0 Mon Sep 17 00:00:00 2001
From 3de81b57cac7cc32ff09a6ac36019aef7f4ef3ba Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 4 Jan 2015 21:37:55 +0000
Subject: gcc2 fix
@@ -18,5 +18,40 @@ index 9b10ee8..3e11510 100644
AM_CPPFLAGS += -DDEBUG
AM_CXXFLAGS += -g
--
1.8.3.4
2.2.2
From 93f6ed27f8c796cf087efda2c0ec0a25eab0acbd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 25 Apr 2015 16:58:40 +0200
Subject: Restore patch for type definitions.
* This was removed when updating from 1.0.0. The lib builds without it,
but then all clients will fail to compile. Please do not remove this
patch again.
diff --git a/ebml/c/libebml_t.h b/ebml/c/libebml_t.h
index 71fe115..8e73ff9 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__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
#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__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
# include <support/SupportDefs.h>
#else // anything else (Linux, BSD, ...)
# include <inttypes.h>
--
2.2.2