From 2ac1800224d2870ae5129e8a09b3a190e77fa506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 11 May 2019 16:30:45 +0200 Subject: Fix FTBFS for build with builtin libchm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- lib/libchmfile/libchmfileimpl.cpp | 5 ----- lib/tdeio-msits/msits.h | 5 ----- 2 files changed, 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(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(ui), buffer, fileOffset, bufferSize); -#endif } // An opened file name, if presend -- cgit v1.2.3