diff options
| author | mm <mm@FreeBSD.org> | 2011-12-20 20:06:33 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-12-20 20:06:33 +0000 |
| commit | de78128d73d25a4377de7c74ce56bd3f3ee8abe7 (patch) | |
| tree | c60338ab5a43518824f6505a33d7628e6358c6e4 /lib/libarchive/archive.h | |
| parent | 3e7916ec1c37c8aabb4a4dcd644f98e38eff81f1 (diff) | |
| download | FreeBSD-src-de78128d73d25a4377de7c74ce56bd3f3ee8abe7.zip FreeBSD-src-de78128d73d25a4377de7c74ce56bd3f3ee8abe7.tar.gz | |
Update libarchive, tar and cpio to version 2.8.5
The following additional vendor revisions are applied:
Revision 3740:
Use archive_clear_error() to clear the error markers.
Obtained from: http://code.google.com/p/libarchive
MFC after: 2 weeks
Diffstat (limited to 'lib/libarchive/archive.h')
| -rw-r--r-- | lib/libarchive/archive.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/libarchive/archive.h b/lib/libarchive/archive.h index 7075e26..bac93f0 100644 --- a/lib/libarchive/archive.h +++ b/lib/libarchive/archive.h @@ -52,7 +52,7 @@ /* These should match the types used in 'struct stat' */ #if defined(_WIN32) && !defined(__CYGWIN__) #define __LA_INT64_T __int64 -# if defined(_SSIZE_T_DEFINED) +# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) # define __LA_SSIZE_T ssize_t # elif defined(_WIN64) # define __LA_SSIZE_T __int64 @@ -98,6 +98,13 @@ # define __LA_DECL #endif +#if defined(__GNUC__) && __GNUC__ >= 3 +#define __LA_PRINTF(fmtarg, firstvararg) \ + __attribute__((__format__ (__printf__, fmtarg, firstvararg))) +#else +#define __LA_PRINTF(fmtarg, firstvararg) /* nothing */ +#endif + #ifdef __cplusplus extern "C" { #endif @@ -129,13 +136,13 @@ extern "C" { * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_NUMBER 2008004 +#define ARCHIVE_VERSION_NUMBER 2008005 __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_STRING "libarchive 2.8.4" +#define ARCHIVE_VERSION_STRING "libarchive 2.8.5" __LA_DECL const char * archive_version_string(void); #if ARCHIVE_VERSION_NUMBER < 3000000 @@ -717,7 +724,7 @@ __LA_DECL const char *archive_format_name(struct archive *); __LA_DECL int archive_format(struct archive *); __LA_DECL void archive_clear_error(struct archive *); __LA_DECL void archive_set_error(struct archive *, int _err, - const char *fmt, ...); + const char *fmt, ...) __LA_PRINTF(3, 4); __LA_DECL void archive_copy_error(struct archive *dest, struct archive *src); __LA_DECL int archive_file_count(struct archive *); |
