From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 30 Dec 2011 06:49:55 +0000 (-0500)
Subject: Merge from trunk: Don't use copyfile() when it's not available.
X-Git-Tag: v3.0.3~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9f90a7ab54f174e3063706608d9bf1d32adfa3d;p=thirdparty%2Flibarchive.git

Merge from trunk: Don't use copyfile() when it's not available.

SVN-Revision: 4036
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index cc3915170..8ce88b380 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -246,7 +246,7 @@ archive_read_disk_entry_from_file(struct archive *_a,
 	return (r);
 }
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(HAVE_COPYFILE_H)
 /*
  * The Mac OS "copyfile()" API copies the extended metadata for a
  * file into a separate file in AppleDouble format (see RFC 1740).