From: Martin Matuska <martin@matuska.org>
Date: Mon, 7 Nov 2016 14:38:30 +0000 (+0100)
Subject: Unbreak build with Linux kernels older than 3.8
X-Git-Tag: v3.3.0~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=555e119ebff47098fd90759b6aed889ae2b3a6cc;p=thirdparty%2Flibarchive.git

Unbreak build with Linux kernels older than 3.8
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 82ef21322..a537798f8 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -1373,7 +1373,7 @@ exit_setup_sparse:
 	return (exit_sts);
 }
 
-#else
+#elif !defined(HAVE_LINUX_FIEMAP_H)
 
 /*
  * Generic (stub) sparse support.
diff --git a/libarchive/test/test_sparse_basic.c b/libarchive/test/test_sparse_basic.c
index 5959c9ce8..06f2c9d54 100644
--- a/libarchive/test/test_sparse_basic.c
+++ b/libarchive/test/test_sparse_basic.c
@@ -188,7 +188,7 @@ is_sparse_supported_fiemap(const char *path)
 static int
 is_sparse_supported(const char *path)
 {
-	return is_sparse_supported_fiemap(const char *path)
+	return is_sparse_supported_fiemap(path);
 }
 #endif
 #endif
@@ -235,7 +235,7 @@ is_sparse_supported(const char *path)
 	return (r >= 0);
 }
 
-#else
+#elif !defined(HAVE_LINUX_FIEMAP_H)
 
 /*
  * Other system may do not have the API such as lseek(HOLE),