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

Accidentally committed this file with DOS line endings

Change-Id: If1f6f9755c4b3b44ae34a126d7f3534969bfc630
üst 9b896716
-*- Mode:Diff -*- -*- Mode:Diff -*-
--- libwpd/src/lib/libwpd_math.h --- libwpd/src/lib/libwpd_math.h
+++ libwpd/src/lib/libwpd_math.h +++ libwpd/src/lib/libwpd_math.h
@@ -31,8 +31,8 @@ @@ -31,8 +31,8 @@
#include <math.h> #include <math.h>
-#if defined(_WIN32) && !defined(__MINGW32__) -#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_MSC_VER) && _MSC_VER < 1800 +#if defined(_MSC_VER) && _MSC_VER < 1800
double rint(double x); double rint(double x);
-#endif /* _WIN32 */ -#endif /* _WIN32 */
+#endif /* _MSC_VER < 1800 */ +#endif /* _MSC_VER < 1800 */
#endif /* LIBWPD_MATH_H */ #endif /* LIBWPD_MATH_H */
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- libwpd/src/lib/libwpd_math.cpp --- libwpd/src/lib/libwpd_math.cpp
+++ libwpd/src/lib/libwpd_math.cpp +++ libwpd/src/lib/libwpd_math.cpp
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
#include "libwpd_math.h" #include "libwpd_math.h"
-#if defined(_WIN32) && !defined(__MINGW32__) -#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_MSC_VER) && _MSC_VER < 1800 +#if defined(_MSC_VER) && _MSC_VER < 1800
double rint(double x) 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