Merge topic 'update-libarchive'

mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00

6c611c6 libarchive: Restore CMake 2.6.3 as minimum version
2f5b677 libarchive: Update README-CMake.txt for new snapshot
156cb3b Merge branch 'libarchive-upstream' into update-libarchive
fd42bf1 libarchive: Set .gitattributes to allow trailing whitespace
4f4fe6e libarchive 3.0.2-r4051 (reduced)
65b6e19 libarchive: Avoid bogus conversion warning from PGI compiler
9ccaeb1 libarchive: Suppress PathScale compiler warnings
2309438 libarchive: Rename isoent_rr_move_dir parameter isoent => curent
b6ca96e libarchive: Include linux/types.h before linux/fiemap.h
f293b73 libarchive: Define _XOPEN_SOURCE=500 on HP-UX
6781a09 libarchive: Cleanup after ZLIB_WINAPI check
f15d757 libarchive: Remove hard-coded build configuration
3a9f449 libarchive: Use Apple copyfile.h API only if available
6af6b96 libarchive: Do not use MNT_NOATIME if not defined
02d5e40 libarchive: Check for 'struct statvfs' member 'f_iosize'
8b7ee30 libarchive: Do not use ST_NOATIME if not defined
...

This commit is contained in:

David Cole

2012-01-09 14:10:01 -05:00

committed by

CMake Topic Stage

parent e1c07a4342 6c611c6b94

commit 5a5c32e1f2

436 changed files with 86219 additions and 111685 deletions

									
										Source/cmSystemTools.cxx
									
		+4
		
												View File
												
				@@ -1866,7 +1866,11 @@ long copy_data(struct archive *ar, struct archive *aw)

				  long r;

				  const void *buff;

				  size_t size;

				#if defined(ARCHIVE_VERSION_NUMBER) && ARCHIVE_VERSION_NUMBER >= 3000000

				  __LA_INT64_T offset;

				#else

				  off_t offset;

				#endif

				  for (;;)

				    {