From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 31 Dec 2008 07:07:58 +0000 (-0500)
Subject: Merge r343 from trunk, fixes Issue 1.
X-Git-Tag: v2.6.1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29674d63692a2ee176b61fbf485fcac292cf395a;p=thirdparty%2Flibarchive.git

Merge r343 from trunk, fixes Issue 1.

SVN-Revision: 344
---

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 9da0bc013..edb653a7c 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -626,11 +626,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 */