From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 10 Nov 2008 19:03:49 +0000 (-0500)
Subject: Minor fixes to build on Windows.
X-Git-Tag: v2.6.0~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f15b03ca3070f8ac88a9215d457e76baeb62784f;p=thirdparty%2Flibarchive.git

Minor fixes to build on Windows.
Submitted by:	Ivailo Petrov

SVN-Revision: 253
---

diff --git a/libarchive/archive_platform.h b/libarchive/archive_platform.h
index b39b302fd..8a093c1df 100644
--- a/libarchive/archive_platform.h
+++ b/libarchive/archive_platform.h
@@ -39,10 +39,7 @@
 /* archive.h and archive_entry.h require this. */
 #define	__LIBARCHIVE_BUILD 1
 
-#ifdef _WIN32
-#include "config_windows.h"
-#include "archive_windows.h"
-#elif defined(PLATFORM_CONFIG_H)
+#if defined(PLATFORM_CONFIG_H)
 /* Use hand-built config.h in environments that need it. */
 #include PLATFORM_CONFIG_H
 #elif defined(HAVE_CONFIG_H)
diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 56423d865..5d5d2d61e 100644
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -42,6 +42,19 @@
 
 //#define	EFTYPE 7
 
+#if !defined(STDIN_FILENO)
+#define STDIN_FILENO 0
+#endif
+
+#if !defined(STDOUT_FILENO)
+#define STDOUT_FILENO 1
+#endif
+
+#if !defined(STDERR_FILENO)
+#define STDERR_FILENO 2
+#endif
+
+
 #if defined(_MSC_VER)
 /* TODO: Fix the code, don't suppress the warnings. */
 #pragma warning(disable:4244)   /* 'conversion' conversion from 'type1' to 'type2', possible loss of data */