From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 31 Aug 2009 02:36:16 +0000 (-0400)
Subject: Minor VS9 fixes.
X-Git-Tag: v2.8.0~403
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6314161d940ec0232a54ab8399088f3ef1b2cc5;p=thirdparty%2Flibarchive.git

Minor VS9 fixes.

SVN-Revision: 1404
---

diff --git a/tar/test/main.c b/tar/test/main.c
index 10bd5ec64..3b0ca9131 100644
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -49,7 +49,7 @@
 #define S_ISREG(m)  ((m) & _S_IFREG)
 #endif
 #define access _access
-#define chdir _chdir
+//#define chdir _chdir
 #ifndef fileno
 #define fileno _fileno
 #endif
diff --git a/tar/tree.c b/tar/tree.c
index eef0d2ae3..6bfb70269 100644
--- a/tar/tree.c
+++ b/tar/tree.c
@@ -43,32 +43,8 @@
  * indicating how to get back to the parent (via chdir("..") for a
  * regular dir or via fchdir(2) for a symlink).
  */
-//#include "bsdtar_platform.h"
-//__FBSDID("$FreeBSD: src/usr.bin/tar/tree.c,v 1.9 2008/11/27 05:49:52 kientzle Exp $");
-
-#if defined(_WIN32)
-#define HAVE_SYS_STAT_H 1
-#define HAVE_DIRECT_H 1
-//#define HAVE_DIRENT_H 1
-#define HAVE_ERRNO_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-//#define HAVE_UNISTD_H 1
-#define HAVE_WINDOWS_H 1
-
-#elif defined(__FreeBSD__)
-#define HAVE_SYS_STAT_H 1
-//#define HAVE_DIRECT_H 1
-#define HAVE_DIRENT_H 1
-#define HAVE_ERRNO_H 1
-#define	HAVE_FCHDIR 1
-#define HAVE_FCNTL_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_UNISTD_H 1
-//#define HAVE_WINDOWS_H 1
-#endif
+#include "bsdtar_platform.h"
+__FBSDID("$FreeBSD: src/usr.bin/tar/tree.c,v 1.9 2008/11/27 05:49:52 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/tar/util.c b/tar/util.c
index 156afa927..d2a3126d8 100644
--- a/tar/util.c
+++ b/tar/util.c
@@ -36,6 +36,9 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.23 2008/12/15 06:00:25 kientzle E
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #endif