aboutsummaryrefslogtreecommitdiff
path: root/lib/libarchive/archive_string.c
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@FreeBSD.org>2004-03-09 19:50:41 +0000
committerTim Kientzle <kientzle@FreeBSD.org>2004-03-09 19:50:41 +0000
commitdf3c1316b07d107960eddb0873b86ed561163949 (patch)
treecdb30a1bca796a2ba7a0c712682c923cc981d32c /lib/libarchive/archive_string.c
parentf5529ff4ce9c26dbd4daf500af8a528c773b33a2 (diff)
Many fixes.
Portability: Thanks to Juergen Lock, libarchive now compiles cleanly on Linux. Along the way, I cleaned up a lot of error return codes and reorganized some code to simplify conditional compilation of certain sections. Bug fixes: * pax format now actually stores filenames that are 101-154 characters long. * pax format now allows newline characters in extended attributes (this fixes a long-standing bug in ACL handling) * mtime/atime are now restored for directories * directory list is now sorted prior to fix-up to permit correct restore of non-writable dir heirarchies
Notes
Notes: svn path=/head/; revision=126782
Diffstat (limited to 'lib/libarchive/archive_string.c')
-rw-r--r--lib/libarchive/archive_string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libarchive/archive_string.c b/lib/libarchive/archive_string.c
index 8f50a422cccc..b100fb9c7ee8 100644
--- a/lib/libarchive/archive_string.c
+++ b/lib/libarchive/archive_string.c
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
+#include "archive_platform.h"
__FBSDID("$FreeBSD$");
/*
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
* strings while minimizing heap activity.
*/
-#ifdef DMALLOC
+#ifdef HAVE_DMALLOC
#include <dmalloc.h>
#endif
#include <err.h>