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

[Tor Lillqvist]

 external/libwpd/UnpackedTarball_libwpd.mk |    4 ++++
 external/libwpd/libwpd-vs2013.patch.1     |   25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

New commits:
commit 9b896716f94029f03e884230e6e5576a24b8d396
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jul 7 21:34:39 2014 +0300

    VS 2013 has rint()
    
    Change-Id: I6ab759a54ef369e20d93c0767d6a103aabd14faa

diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk
index d4b4c7a..e8abb60 100644
--- a/external/libwpd/UnpackedTarball_libwpd.mk
+++ b/external/libwpd/UnpackedTarball_libwpd.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpd))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libwpd,$(WPD_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
+	external/libwpd/libwpd-vs2013.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpd/libwpd-vs2013.patch.1 b/external/libwpd/libwpd-vs2013.patch.1
new file mode 100644
index 0000000..cf1a6b0
--- /dev/null
+++ b/external/libwpd/libwpd-vs2013.patch.1
@@ -0,0 +1,25 @@
+-*- Mode:Diff -*-
+--- libwpd/src/lib/libwpd_math.h
++++ libwpd/src/lib/libwpd_math.h
+@@ -31,8 +31,8 @@
+ #include <math.h>
+ 
+-#if defined(_WIN32) && !defined(__MINGW32__)
++#if defined(_MSC_VER) && _MSC_VER < 1800
+ double rint(double x);
+-#endif /* _WIN32 */
++#endif /* _MSC_VER < 1800 */
+ 
+ #endif /* LIBWPD_MATH_H */
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+--- libwpd/src/lib/libwpd_math.cpp
++++ libwpd/src/lib/libwpd_math.cpp
+@@ -26,7 +26,7 @@
+ 
+ #include "libwpd_math.h"
+ 
+-#if defined(_WIN32) && !defined(__MINGW32__)
++#if defined(_MSC_VER) && _MSC_VER < 1800
+ 
+ double rint(double x)
+ {