From faeada5e262d46de359fc69d792aeb68633540ee Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Thu, 5 Mar 2009 00:35:21 +0000 Subject: [PATCH] Merge r344 from libarchive.googlecode.com: __LA_INT64_T and __LA_SSIZE_T are part of the public API and therefore need to be exposed. This is ugly; I'd like to find a better solution for this. --- lib/libarchive/archive.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libarchive/archive.h b/lib/libarchive/archive.h index cfc31979f4b..09e0c4a9edc 100644 --- a/lib/libarchive/archive.h +++ b/lib/libarchive/archive.h @@ -629,11 +629,14 @@ __LA_DECL void archive_copy_error(struct archive *dest, } #endif -/* This is meaningless outside of this header. */ +/* These are meaningless outside of this header. */ #undef __LA_DECL #undef __LA_GID_T -#undef __LA_INT64_T -#undef __LA_SSIZE_T #undef __LA_UID_T +/* These need to remain defined because they're used in the + * callback type definitions. XXX Fix this. This is ugly. XXX */ +/* #undef __LA_INT64_T */ +/* #undef __LA_SSIZE_T */ + #endif /* !ARCHIVE_H_INCLUDED */