6a4b1006f9
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2018-09-03 (5fe69dd0)
2018-09-26 09:53:15 -04:00
6df1bda1c5
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2017-07-09 (98a69539)
2017-07-20 11:36:18 -04:00
5a58efaac3
libarchive: Avoid using name 'u_long'
...
The system headers on some platforms define a 'u_long' type so we cannot
use the name. Spell out 'unsigned long' instead.
2014-04-11 09:01:27 -04:00
2f1978632b
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
2014-04-03 15:02:49 -04:00
Brad King