diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-02 14:48:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-02 14:48:48 (GMT) |
| commit | e9bc469b2abcd0ad4cb3ad4bfefbc5ef1f559c1b (patch) | |
| tree | 7e84ef0666764bcad5e77c9955c7dcd13413b427 /Utilities/cmlibarchive/libarchive/archive_write_private.h | |
| parent | db9c40b4f5c9e1aadfe11c89040bad1e3b386162 (diff) | |
| parent | 501345e470bb9c5b0cb61aff84bd50ffdd95b92d (diff) | |
| download | CMake-e9bc469b2abcd0ad4cb3ad4bfefbc5ef1f559c1b.zip CMake-e9bc469b2abcd0ad4cb3ad4bfefbc5ef1f559c1b.tar.gz CMake-e9bc469b2abcd0ad4cb3ad4bfefbc5ef1f559c1b.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_write_private.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_private.h b/Utilities/cmlibarchive/libarchive/archive_write_private.h index 0c3cc0c..0dfd1b1 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_write_private.h @@ -144,7 +144,7 @@ __archive_write_format_header_ustar(struct archive_write *, char buff[512], struct archive_string_conv *); struct archive_write_program_data; -struct archive_write_program_data * __archive_write_program_allocate(void); +struct archive_write_program_data * __archive_write_program_allocate(const char *program_name); int __archive_write_program_free(struct archive_write_program_data *); int __archive_write_program_open(struct archive_write_filter *, struct archive_write_program_data *, const char *); |