Brad King
|
932848f420
|
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts by integrating changes from both sides.
|
2015-10-21 10:18:52 -04:00 |
|
Brad King
|
102071f80c
|
Merge branch 'libarchive-upstream' into update-libarchive
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive.h
Utilities/cmlibarchive/libarchive/archive_entry.h
Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
Utilities/cmlibarchive/libarchive/archive_windows.h
Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
|
2013-07-31 08:19:13 -04:00 |
Jim Hague
|
a8995ebe35
|
libarchive: Avoid trailing , in enum for XL v6 (#13148)
IBM xlc v6 cannot cope with a trailing ',' in enum definitions.
|
2012-04-19 09:00:29 -04:00 |
|
Brad King
|
2309438321
|
libarchive: Rename isoent_rr_move_dir parameter isoent => curent
The PGI compiler confuses parameter name "isoent" with "struct isoent".
Rename the parameter to "curent" to avoid confusion.
|
2012-01-04 09:48:41 -05:00 |
|
Brad King
|
3b9eaec738
|
libarchive: Cast constants to int64_t instead of using LL suffix
The LL suffix is not portable. Use an explicit cast instead.
|
2011-12-23 16:04:58 -05:00 |
|
Brad King
|
ffa6faa40d
|
libarchive: Include cm_zlib.h to get zlib used by CMake
|
2011-12-22 10:38:37 -05:00 |
|
Brad King
|
3e5a80f063
|
Merge branch 'libarchive-upstream' into update-libarchive
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
|
2011-12-20 11:54:25 -05:00 |