[PATCH 1/9] Fix compilation with older libzip
Thiago Macieira
thiago at macieira.org
Wed Dec 11 17:56:27 UTC 2013
Older libzip lack zip_get_num_entries. Thanks to Lubomir for spotting
the version macro.
Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
qt-ui/subsurfacewebservices.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index b974191..c0091fc 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();
}
--
1.7.11.7
More information about the subsurface
mailing list