From a79bf3f2b8292e48a51c6117248fe9a9be8f569e Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Fri, 25 Sep 2009 01:49:17 -0400 Subject: [PATCH] Only build archive_entry_copy_bhfi.c on Windows platforms that aren't Cygwin. Thanks to Charles Wilson for pointing this out and providing the Makefile.am fix. SVN-Revision: 1471 --- Makefile.am | 1 + libarchive/CMakeLists.txt | 2 +- libarchive/archive_entry_copy_bhfi.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 22e2db6f4..47144aa84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,6 +170,7 @@ libarchive_la_SOURCES= \ if INC_WINDOWS_FILES libarchive_la_SOURCES+= \ + libarchive/archive_entry_copy_bhfi.c \ libarchive/archive_windows.h \ libarchive/archive_windows.c \ libarchive/filter_fork_windows.c diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt index 653fa80a7..60fbeec46 100644 --- a/libarchive/CMakeLists.txt +++ b/libarchive/CMakeLists.txt @@ -105,12 +105,12 @@ SET(libarchive_MANS ) IF(WIN32 AND NOT CYGWIN) + LIST(APPEND libarchive_SOURCES archive_entry_copy_bhfi.c) LIST(APPEND libarchive_SOURCES archive_windows.c) LIST(APPEND libarchive_SOURCES archive_windows.h) LIST(APPEND libarchive_SOURCES filter_fork_windows.c) ENDIF(WIN32 AND NOT CYGWIN) - # Libarchive is a shared library ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS}) diff --git a/libarchive/archive_entry_copy_bhfi.c b/libarchive/archive_entry_copy_bhfi.c index 29438414e..9ad181e26 100644 --- a/libarchive/archive_entry_copy_bhfi.c +++ b/libarchive/archive_entry_copy_bhfi.c @@ -28,6 +28,8 @@ __FBSDID("$FreeBSD$"); #include "archive_entry.h" +#if defined(_WIN32) && !defined(__CYGWIN__) + #define EPOC_TIME (116444736000000000ULL) __inline static void @@ -68,3 +70,4 @@ archive_entry_copy_bhfi(struct archive_entry *entry, + bhfi->nFileSizeLow); // archive_entry_set_mode(entry, st->st_mode); } +#endif -- 2.47.3