[Libreoffice-commits] core.git: external/libabw

[Fridrich Å trba]

 external/libabw/UnpackedTarball_libabw.mk     |    4 ++
 external/libabw/libabw-0.0.1-inttypes.patch.1 |   36 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

New commits:
commit 9c46e4069db51ab0fc8b3e197d27b5f947a3fdeb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 16 18:20:09 2014 +0100

    No need to use the stuff from inttypes here
    
    Change-Id: I8d80a8ff223d7c57f7efe808e07ac31aa4d521fd

diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk
index 6288b0e..c61f2d5 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
+	external/libabw/libabw-0.0.1-inttypes.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-inttypes.patch.1 b/external/libabw/libabw-0.0.1-inttypes.patch.1
new file mode 100644
index 0000000..7c13690
--- /dev/null
+++ b/external/libabw/libabw-0.0.1-inttypes.patch.1
@@ -0,0 +1,36 @@
+diff --git a/src/lib/ABWStylesCollector.cpp b/src/lib/ABWStylesCollector.cpp
+index e422b6d..beb4cb9 100644
+--- a/src/lib/ABWStylesCollector.cpp
++++ b/src/lib/ABWStylesCollector.cpp
+@@ -49,10 +49,10 @@ enum ABWListType
+   NOT_A_LIST = 0xff
+ };
+ 
+-static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
++static int abw_unichar_to_utf8(unsigned c, char *outbuf)
+ {
+-  uint8_t len = 1;
+-  uint8_t first = 0;
++  unsigned char len = 1;
++  unsigned char first = 0;
+ 
+   if (c < 0x80)
+   {
+@@ -87,7 +87,7 @@ static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
+ 
+   if (outbuf)
+   {
+-    for (uint8_t i = (uint8_t)(len - 1); i > 0; --i)
++    for (unsigned char i = (unsigned char)(len - 1); i > 0; --i)
+     {
+       outbuf[i] = (char)((c & 0x3f) | 0x80);
+       c >>= 6;
+@@ -98,7 +98,7 @@ static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
+   return len;
+ }
+ 
+-static void appendUCS4(WPXString &str, uint32_t ucs4)
++static void appendUCS4(WPXString &str, unsigned ucs4)
+ {
+   int charLength = abw_unichar_to_utf8(ucs4, 0);
+   char *utf8 = new char[charLength+1];