diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:35:21 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:35:21 +0000 |
| commit | 89ca51e18935f741b2d8963f76cad9840e9b5f80 (patch) | |
| tree | 3c47eea0a7a4812c40d44005c56298bfd4ff003f /lib/libarchive/archive.h | |
| parent | 1d35cb198bc3dfc1324b7176dd015d2d4f577534 (diff) | |
| download | FreeBSD-src-89ca51e18935f741b2d8963f76cad9840e9b5f80.zip FreeBSD-src-89ca51e18935f741b2d8963f76cad9840e9b5f80.tar.gz | |
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.
Diffstat (limited to 'lib/libarchive/archive.h')
| -rw-r--r-- | lib/libarchive/archive.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libarchive/archive.h b/lib/libarchive/archive.h index cfc3197..09e0c4a 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 */ |
