Merge branch 'master' of github.com:mdh34/quickDocs

mdh34 · Oct 7, 2018 · 070e8aa · 070e8aa
2 parents 46c4bc9 + 0e8bfd9
commit 070e8aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Services/Downloader.vala b/src/Services/Downloader.vala
@@ -41,15 +41,24 @@ namespace Downloader {
                 continue;
             };
 
-            void* buffer = null;
-            size_t buffer_length;
             Posix.off_t offset;
 
+#if ARCHIVE_332
+            uint8[] buffer;
+            if (entry.size () > 0) {
+                while (reader.read_data_block (out buffer, out offset) != Archive.Result.EOF) {
+                    disk.write_data_block (buffer, offset);
+                }
+            }
+#else
+            void* buffer = null;
+            size_t buffer_length;
             if (entry.size () > 0) {
                 while (reader.read_data_block (out buffer, out buffer_length, out offset) != Archive.Result.EOF) {
                     disk.write_data_block (buffer, buffer_length, offset);
                 }
             }
+#endif
         }
     }
 

diff --git a/src/meson.build b/src/meson.build
@@ -1,3 +1,6 @@
+if dependency('libarchive').version().version_compare('>=3.3.2')
+    add_project_arguments('--define=ARCHIVE_332', language: 'vala')
+endif
 executable(
     meson.project_name(),
     'Application.vala',