svn commit: r189382 - head/lib/libarchive

[Tim Kientzle]

Author: kientzle
Date: Thu Mar  5 00:35:21 2009
New Revision: 189382
URL: http://svn.freebsd.org/changeset/base/189382

Log:
  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.

Modified:
  head/lib/libarchive/archive.h

Modified: head/lib/libarchive/archive.h
==============================================================================
--- head/lib/libarchive/archive.h	Thu Mar  5 00:31:48 2009	(r189381)
+++ head/lib/libarchive/archive.h	Thu Mar  5 00:35:21 2009	(r189382)
@@ -629,11 +629,14 @@ __LA_DECL void		 archive_copy_error(stru
 }
 #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 */