Merge r343 from trunk, fixes Issue 1.

SVN-Revision: 344

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 9da0bc01383834a4f3022dc99757c6910c7905a6..edb653a7c318a76ef90fc6d0e5be676e13019e55 100644 (file)
--- 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 */