summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-05-11 16:30:45 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-05-12 16:30:29 +0200
commit2ac1800224d2870ae5129e8a09b3a190e77fa506 (patch)
treef108820b2ea9cf4927944fbacc2428c7d97eb6d2
parentdb17d12f24fab5ed233b222c90000e3c0081f99d (diff)
downloadkchmviewer-2ac1800224d2870ae5129e8a09b3a190e77fa506.tar.gz
kchmviewer-2ac1800224d2870ae5129e8a09b3a190e77fa506.zip
Fix FTBFS for build with builtin libchm.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--lib/libchmfile/libchmfileimpl.cpp5
-rw-r--r--lib/tdeio-msits/msits.h5
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