Better fix.

Restore e6d1e13b2880ab0e6166e5ed168df7e6e0de943b,
and make sure that we include windows.h earlier for the CLI tools.

diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index 590b501a441e426fb9a20260f24c46f76a0d6fe9..2f7fc6d1e46e870d2f19318f57691f623939cc51 100644 (file)
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -43,10 +43,6 @@
 #include <stddef.h>  /* for wchar_t */
 #include <time.h>
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include <windows.h>
-#endif
-
 /* Get a suitable 64-bit integer type. */
 #if defined(_WIN32) && !defined(__CYGWIN__)
 # define       __LA_INT64_T    __int64

diff --git a/tar/bsdtar_platform.h b/tar/bsdtar_platform.h
index 45228f504f8491972e65a4b90ff30327eb8cd091..e73f9828b3b0b0a536169fde5df5ced0953253ad 100644 (file)
--- a/tar/bsdtar_platform.h
+++ b/tar/bsdtar_platform.h
@@ -42,6 +42,10 @@
 #include "config.h"
 #endif
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include "bsdtar_windows.h"
+#endif
+
 /* Get a real definition for __FBSDID if we can */
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
@@ -125,8 +129,4 @@
 #define        __LA_DEAD
 #endif
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include "bsdtar_windows.h"
-#endif
-
 #endif /* !BSDTAR_PLATFORM_H_INCLUDED */