Kaydet (Commit) 9b896716 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

VS 2013 has rint()

Change-Id: I6ab759a54ef369e20d93c0767d6a103aabd14faa
üst cdcb08c9
......@@ -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:
-*- 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)
{
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment