]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Revert "Remove unnecessary windows.h include"
authorNiLuJe <ninuje@gmail.com>
Sun, 22 Dec 2013 22:05:24 +0000 (23:05 +0100)
committerNiLuJe <ninuje@gmail.com>
Sun, 22 Dec 2013 22:05:24 +0000 (23:05 +0100)
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 *);
                                                                ^

libarchive/archive_entry.h

index 2f7fc6d1e46e870d2f19318f57691f623939cc51..590b501a441e426fb9a20260f24c46f76a0d6fe9 100644 (file)
 #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