From 1b5b562da8eb328f5e7b9ad86796e526f88bba09 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 11 Dec 2013 17:56:27 -0800 Subject: [PATCH] Fix compilation with older libzip Older libzip lack zip_get_num_entries. Thanks to Lubomir for spotting the version macro. Signed-off-by: Thiago Macieira Signed-off-by: Dirk Hohndel --- qt-ui/subsurfacewebservices.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index b974191c7..c0091fc03 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -760,6 +760,15 @@ void DivelogsDeWebServices::downloadFinished() // now allow the user to cancel or accept ui.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true); + quint64 entries; +#if defined(LIBZIP_VERSION_MAJOR) + entries = zip_get_num_entries(zip, 0); +#else + // old version of libzip + entries = zip_get_num_files(zip); +#endif + + zip_close(zip); zipFile.close(); }