summaryrefslogtreecommitdiffstats
path: root/libarchive/archive.h
diff options
context:
space:
mode:
authorLibArchive Upstream <libarchive-discuss@googlegroups.com>2011-12-31 18:54:34 (GMT)
committerBrad King <brad.king@kitware.com>2012-01-05 13:52:42 (GMT)
commit4f4fe6e50bb3dbe59f9bc3cc848cbd07dead324d (patch)
tree9051c1592328819c0adb69ba8148393cf9129f04 /libarchive/archive.h
parent2f4a3792bbfdb4e05cf7468059b3f6308f5ed91f (diff)
downloadCMake-4f4fe6e50bb3dbe59f9bc3cc848cbd07dead324d.zip
CMake-4f4fe6e50bb3dbe59f9bc3cc848cbd07dead324d.tar.gz
CMake-4f4fe6e50bb3dbe59f9bc3cc848cbd07dead324d.tar.bz2
libarchive 3.0.2-r4051 (reduced)
Extract upstream libarchive using the following shell code. url=https://libarchive.googlecode.com/svn/release/3.0 v=3.0.2 r=4051 paths=" CMakeLists.txt COPYING CTestConfig.cmake build/cmake build/pkgconfig build/utils build/version libarchive/*.* " date=$(svn log -q -c$r $url | sed -n "/^r/ {s/[^|]*|[^|]*|//;p;}") svn export -r$r $url libarchive-$v-r$r && mkdir libarchive-$v-r$r-reduced && (cd libarchive-$v-r$r && tar c $paths) | (cd libarchive-$v-r$r-reduced && tar x) echo "r$r date: $date"
Diffstat (limited to 'libarchive/archive.h')
-rw-r--r--libarchive/archive.h19
1 files changed, 3 insertions, 16 deletions
diff --git a/libarchive/archive.h b/libarchive/archive.h
index 14c2aed..13cbe79 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -124,27 +124,16 @@ extern "C" {
* easy to compare versions at build time: for version a.b.c, the
* version number is printf("%d%03d%03d",a,b,c). For example, if you
* know your application requires version 2.12.108 or later, you can
- * assert that ARCHIVE_VERSION >= 2012108.
- *
- * This single-number format was introduced with libarchive 1.9.0 in
- * the libarchive 1.x family and libarchive 2.2.4 in the libarchive
- * 2.x family. The following may be useful if you really want to do
- * feature detection for earlier libarchive versions (which defined
- * ARCHIVE_API_VERSION and ARCHIVE_API_FEATURE instead):
- *
- * #ifndef ARCHIVE_VERSION_NUMBER
- * #define ARCHIVE_VERSION_NUMBER \
- * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
- * #endif
+ * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
*/
/* Note: Compiler will complain if this does not match archive_entry.h! */
-#define ARCHIVE_VERSION_NUMBER 3000001
+#define ARCHIVE_VERSION_NUMBER 3000002
__LA_DECL int archive_version_number(void);
/*
* Textual name/version of the library, useful for version displays.
*/
-#define ARCHIVE_VERSION_STRING "libarchive 3.0.1b"
+#define ARCHIVE_VERSION_STRING "libarchive 3.0.2"
__LA_DECL const char * archive_version_string(void);
/* Declare our basic types. */
@@ -447,8 +436,6 @@ __LA_DECL int archive_read_data_block(struct archive *a,
* 'into_fd': writes data to specified filedes
*/
__LA_DECL int archive_read_data_skip(struct archive *);
-__LA_DECL int archive_read_data_into_buffer(struct archive *,
- void *buffer, __LA_SSIZE_T len);
__LA_DECL int archive_read_data_into_fd(struct archive *, int fd);
/*