[PATCH] Fix compilation with older libzip

Thiago Macieira thiago at macieira.org
Fri Dec 6 09:34:16 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, 8 insertions(+), 1 deletion(-)

diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index 8dd6b59..198de78 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -617,7 +617,14 @@ void DivelogsDeWebServices::downloadFinished()
 		return;
 	}
 
-	quint64 entries = zip_get_num_entries(zip, 0);
+	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
+
 	for (quint64 i = 0; i < entries; ++i) {
 		struct zip_file *zip_file = zip_fopen_index(zip, i, 0);
 		if (!zip_file) {
-- 
1.7.11.7



More information about the subsurface mailing list