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

[Tor Lillqvist]

 external/libwpd/libwpd-vs2013.patch.1 |   50 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

New commits:
commit ed4697e6659b820c6a851b07e52f837ac4f7c008
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jul 7 21:53:53 2014 +0300

    Accidentally committed this file with DOS line endings
    
    Change-Id: If1f6f9755c4b3b44ae34a126d7f3534969bfc630

diff --git a/external/libwpd/libwpd-vs2013.patch.1 b/external/libwpd/libwpd-vs2013.patch.1
index cf1a6b0..efdd305 100644
--- a/external/libwpd/libwpd-vs2013.patch.1
+++ b/external/libwpd/libwpd-vs2013.patch.1
@@ -1,25 +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)
- {
+-*- 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)
+ {