diff options
| author | Brad King <brad.king@kitware.com> | 2012-01-05 14:02:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-01-05 14:02:58 (GMT) |
| commit | 156cb3bbf257f747672eac945fa2e19d33fc3a63 (patch) | |
| tree | a411d9b89fb1ad0960b5baf76ca0ff752acf6fa9 /Utilities/cmlibarchive/libarchive/archive_windows.h | |
| parent | fd42bf1bdcb95615dd725ae588db02b22a3aebaa (diff) | |
| parent | 4f4fe6e50bb3dbe59f9bc3cc848cbd07dead324d (diff) | |
| download | CMake-156cb3bbf257f747672eac945fa2e19d33fc3a63.zip CMake-156cb3bbf257f747672eac945fa2e19d33fc3a63.tar.gz CMake-156cb3bbf257f747672eac945fa2e19d33fc3a63.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive_windows.c
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_windows.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_windows.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h b/Utilities/cmlibarchive/libarchive/archive_windows.h index ac44192..c581af3 100644 --- a/Utilities/cmlibarchive/libarchive/archive_windows.h +++ b/Utilities/cmlibarchive/libarchive/archive_windows.h @@ -91,7 +91,7 @@ /* Alias the Windows _function to the POSIX equivalent. */ #define close _close -#define fcntl __la_fcntl +#define fcntl(fd, cmd, flg) /* No operation. */ #ifndef fileno #define fileno _fileno #endif @@ -249,7 +249,6 @@ /* Replacement POSIX function */ -extern int __la_fcntl(int fd, int cmd, int val); extern int __la_fstat(int fd, struct stat *st); extern int __la_lstat(const char *path, struct stat *st); #if defined(__LA_LSEEK_NEEDED) |