diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-07 21:53:53 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-07-07 21:53:53 +0300 |
| commit | ed4697e6659b820c6a851b07e52f837ac4f7c008 (patch) | |
| tree | 068829b3abab7b72330f27f36f2ca270d7a5c7f5 /external/libwpd | |
| parent | 9b896716f94029f03e884230e6e5576a24b8d396 (diff) | |
Accidentally committed this file with DOS line endings
Change-Id: If1f6f9755c4b3b44ae34a126d7f3534969bfc630
Diffstat (limited to 'external/libwpd')
| -rw-r--r-- | external/libwpd/libwpd-vs2013.patch.1 | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/external/libwpd/libwpd-vs2013.patch.1 b/external/libwpd/libwpd-vs2013.patch.1 index cf1a6b0353e2..efdd305939f4 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) + { |