Add upstream patch to fix the build with libc++.
This commit is contained in:
parent
06acdd364d
commit
e7c8f6e8f9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=333012
1 changed files with 25 additions and 0 deletions
25
editors/calligra/files/patch-git_3f2bf6c
Normal file
25
editors/calligra/files/patch-git_3f2bf6c
Normal file
|
@ -0,0 +1,25 @@
|
|||
commit 3f2bf6cf65a280b449e3ad854d3a6c4ce92208bc
|
||||
Author: Yue Liu <yue.liu@mail.com>
|
||||
Date: Sat Oct 12 12:10:40 2013 -0400
|
||||
|
||||
fix osx compile issue
|
||||
|
||||
--- filters/words/msword-odf/wv2/src/word97_helper.cpp
|
||||
+++ filters/words/msword-odf/wv2/src/word97_helper.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <string.h> // memcpy
|
||||
#include <algorithm>
|
||||
#include <functional> // std::bind2nd for gcc 2.9x
|
||||
+#include <cstdlib>
|
||||
|
||||
#include "wvlog.h"
|
||||
|
||||
@@ -730,7 +731,7 @@ namespace
|
||||
{
|
||||
m_center = readS16( ptr + index * sizeof( S16 ) );
|
||||
// A negative value doesn't make sense here, right? Hmmm
|
||||
- m_plusMinus = std::abs( readS16( ptr + itbdDelMax * sizeof( S16 ) + index * sizeof( S16 ) ) );
|
||||
+ m_plusMinus = std::abs( (int)( readS16( ptr + itbdDelMax * sizeof( S16 ) + index * sizeof( S16 ) ) ) );
|
||||
}
|
||||
|
||||
bool contains( S16 position ) const { return m_center - m_plusMinus <= position && m_center + m_plusMinus >= position; }
|
Loading…
Reference in a new issue