From: NiLuJe <ninuje@gmail.com>
Date: Sun, 22 Dec 2013 22:05:24 +0000 (+0100)
Subject: Revert "Remove unnecessary windows.h include"
X-Git-Tag: v3.1.900a~343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=819f5c58a8a806f2ae683c8d7b15e4886add30d6;p=thirdparty%2Flibarchive.git

Revert "Remove unnecessary windows.h include"

This reverts commit e6d1e13b2880ab0e6166e5ed168df7e6e0de943b.

We do need this (for the CLI tools).

Fixes a build failure on MinGW:
  CC       tar/bsdtar-bsdtar.o
In file included from tar/bsdtar_platform.h:62:0,
                 from tar/bsdtar.c:26:
./libarchive/archive_entry.h:250:64: error: unknown type name 'BY_HANDLE_FILE_INFORMATION'
 __LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, BY_HANDLE_FILE_INFORMATION *);
                                                                ^
---

diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index 2f7fc6d1e..590b501a4 100644
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -43,6 +43,10 @@
 #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