[Libreoffice-commits] core.git: libexttextcat/exttextcat-msvc-stdint.patch libexttextcat/UnpackedTarball_exttextcat.mk

Tor Lillqvist tml at collabora.com
Thu Sep 19 01:49:47 PDT 2013


 libexttextcat/UnpackedTarball_exttextcat.mk |    4 ++++
 libexttextcat/exttextcat-msvc-stdint.patch  |   21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit 25006b42e09e1df52f733aaefa51937e07cd7c38
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Sep 19 11:46:58 2013 +0300

    MSVC 2010 and newer does have a <stdint.h>
    
    Change-Id: I8f41d027ec890ed57275c04412c61d959d37b66c

diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk b/libexttextcat/UnpackedTarball_exttextcat.mk
index 9a272b5..ef9ce13 100644
--- a/libexttextcat/UnpackedTarball_exttextcat.mk
+++ b/libexttextcat/UnpackedTarball_exttextcat.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\
+    libexttextcat/exttextcat-msvc-stdint.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/exttextcat-msvc-stdint.patch b/libexttextcat/exttextcat-msvc-stdint.patch
new file mode 100644
index 0000000..09da3e3
--- /dev/null
+++ b/libexttextcat/exttextcat-msvc-stdint.patch
@@ -0,0 +1,21 @@
+--- foo/foo/src/common.h
++++ foo/foo/src/common.h
+@@ -45,18 +45,7 @@
+ {
+ #endif
+ 
+-#ifdef _MSC_VER
+-    typedef __int8 int8_t;
+-    typedef unsigned __int8 uint8_t;
+-    typedef __int16 int16_t;
+-    typedef unsigned __int16 uint16_t;
+-    typedef __int32 int32_t;
+-    typedef unsigned __int32 uint32_t;
+-    typedef __int64 int64_t;
+-    typedef unsigned __int64 uint64_t;
+-#else
+ #   include <stdint.h>
+-#endif
+ 
+     typedef uint32_t uint4;
+     typedef uint16_t uint2;


More information about the Libreoffice-commits mailing list