diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-07 21:34:39 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-07-07 21:34:39 +0300 |
| commit | 9b896716f94029f03e884230e6e5576a24b8d396 (patch) | |
| tree | c696db2a3aaba767992b762007acf69890c2036c /external | |
| parent | cdcb08c9dfdec86b232bd4ba4a8590e184836376 (diff) | |
VS 2013 has rint()
Change-Id: I6ab759a54ef369e20d93c0767d6a103aabd14faa
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwpd/UnpackedTarball_libwpd.mk | 4 | ||||
| -rw-r--r-- | external/libwpd/libwpd-vs2013.patch.1 | 25 |
2 files changed, 29 insertions, 0 deletions
diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index d4b4c7a99e8d..e8abb60d1551 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 000000000000..cf1a6b0353e2 --- /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)
+ {
|