diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-14 16:56:23 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-14 16:56:50 +0200 |
| commit | edab1a30fcb159347ee6034fefcfd0773aa5f335 (patch) | |
| tree | fa78ec21559f59798cbf74c4156f9dc00a8b5e78 /libmwaw | |
| parent | 1d4bbe7b305558faf86aa083cc50d71a7804ef7d (diff) | |
trying to unbreak windows build
Change-Id: I3db28992dc3d3bbe63d8679d5a43bab11a66bdcd
Diffstat (limited to 'libmwaw')
| -rw-r--r-- | libmwaw/UnpackedTarball_libmwaw.mk | 4 | ||||
| -rw-r--r-- | libmwaw/libmwaw-0.1.9.patch.1 | 15 |
2 files changed, 19 insertions, 0 deletions
diff --git a/libmwaw/UnpackedTarball_libmwaw.mk b/libmwaw/UnpackedTarball_libmwaw.mk index 96fe9df6afa0..8e3be68d7e96 100644 --- a/libmwaw/UnpackedTarball_libmwaw.mk +++ b/libmwaw/UnpackedTarball_libmwaw.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw)) $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\ + libmwaw/libmwaw-0.1.9.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libmwaw/libmwaw-0.1.9.patch.1 b/libmwaw/libmwaw-0.1.9.patch.1 new file mode 100644 index 000000000000..e5eb6da8ecf8 --- /dev/null +++ b/libmwaw/libmwaw-0.1.9.patch.1 @@ -0,0 +1,15 @@ +--- a/src/lib/MWAWTable.hxx ++++ b/src/lib/MWAWTable.hxx +@@ -117,7 +117,11 @@ protected: + - c2.m_cell->box().size()[m_coord]; + if (diffF < 0) return true; + if (diffF > 0) return false; +- return ssize_t(c1.m_cell) < ssize_t(c2.m_cell); ++#ifdef _WIN64 ++ return __int64(c1.m_cell) < __int64(c2.m_cell); ++#else ++ return long(c1.m_cell) < long(c2.m_cell); ++#endif + } + + //! the coord to compare |