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

diff --git a/Makefile.am b/Makefile.am
index 22e2db6f49a29127885c38153f5a3d2d6d3d7333..47144aa8402f98b84d5ad4f83b8a115b664a8951 100644 (file)
--- 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 653fa80a743e84eb8e0943ff227c924412e65aa1..60fbeec46ce153af72405ab17c18e6c82a7929a4 100644 (file)
--- 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 29438414e96f72d9eb44284206c49cd293763e5a..9ad181e264259abfad1fb7f411444553b87af1ca 100644 (file)
--- 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