diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-05-11 16:30:45 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-05-12 17:38:10 +0200 |
| commit | ac9ac39fde0adb59f3c696a8c18cc9be96c59742 (patch) | |
| tree | e1a03242e44e031509ba6b8dcd05d94f75e3e1ba | |
| parent | 66815c9c1679da40b1454d1faf05b353004aab13 (diff) | |
| download | kchmviewer-ac9ac39fde0adb59f3c696a8c18cc9be96c59742.tar.gz kchmviewer-ac9ac39fde0adb59f3c696a8c18cc9be96c59742.zip | |
Fix FTBFS for build with builtin libchm.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2ac1800224d2870ae5129e8a09b3a190e77fa506)
| -rw-r--r-- | lib/libchmfile/libchmfileimpl.cpp | 5 | ||||
| -rw-r--r-- | lib/tdeio-msits/msits.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/lib/libchmfile/libchmfileimpl.cpp b/lib/libchmfile/libchmfileimpl.cpp index 39268b0..a5ad04c 100644 --- a/lib/libchmfile/libchmfileimpl.cpp +++ b/lib/libchmfile/libchmfileimpl.cpp @@ -531,13 +531,8 @@ bool LCHMFileImpl::ResolveObject(const TQString& fileName, chmUnitInfo *ui) cons size_t LCHMFileImpl::RetrieveObject(const chmUnitInfo *ui, unsigned char *buffer, LONGUINT64 fileOffset, LONGINT64 bufferSize) const { -#if USE_BUILTIN_CHMLIB - return ::chm_retrieve_object(m_chmFile, ui, buffer, - fileOffset, bufferSize); -#else return ::chm_retrieve_object(m_chmFile, const_cast<chmUnitInfo*>(ui), buffer, fileOffset, bufferSize); -#endif } diff --git a/lib/tdeio-msits/msits.h b/lib/tdeio-msits/msits.h index 6fb92f9..7678ba3 100644 --- a/lib/tdeio-msits/msits.h +++ b/lib/tdeio-msits/msits.h @@ -62,13 +62,8 @@ private: // Retrieve an object from the CHM file inline size_t RetrieveObject (const chmUnitInfo *ui, unsigned char *buffer, LONGUINT64 fileOffset, LONGINT64 bufferSize) { -#if USE_BUILTIN_CHMLIB - return ::chm_retrieve_object(m_chmFile, ui, buffer, - fileOffset, bufferSize); -#else return ::chm_retrieve_object(m_chmFile, const_cast<chmUnitInfo*>(ui), buffer, fileOffset, bufferSize); -#endif } // An opened file name, if presend |