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 82ef21322eac852afce834ca25fc405f8d197eea..a537798f88625403bc58ccca76b977c4d70f3af6 100644 (file)
--- 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 5959c9ce8a2a7e77f434e7cf927a262e2a52a545..06f2c9d54686734edbcd8590aa82d8caa97f41f9 100644 (file)
--- 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),