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_read_open_filename.c | |
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_read_open_filename.c')
-rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_open_filename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c b/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c index 622c960..5611aa8 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c @@ -178,7 +178,7 @@ archive_read_open_filename_w(struct archive *a, const wchar_t *wfilename, #else /* * POSIX system does not support a wchar_t interface for - * open() system call, so we have to translate a whcar_t + * open() system call, so we have to translate a wchar_t * filename to multi-byte one and use it. */ struct archive_string fn; |