CMake

Commit Graph

Author	SHA1	Message	Date
Brad King	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
Brad King	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

Author

SHA1

Message

Date

Brad King

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

Brad King

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

2 Commits