From: Tim Kientzle <kientzle@gmail.com>
Date: Thu, 8 May 2008 19:12:12 +0000 (-0400)
Subject: Include the Windows helper files in the portable distribution.
X-Git-Tag: v2.6.0~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56c6190462b6a505847413182abbe38fe55f76f2;p=thirdparty%2Flibarchive.git

Include the Windows helper files in the portable distribution.
Prune out a few more unnecessary definitions from archive_windows.h.

SVN-Revision: 32
---

diff --git a/Makefile.am b/Makefile.am
index d6a3e377b..6defd828f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,8 +156,10 @@ libarchive_man_MANS=						\
 	libarchive/tar.5
 
 # Additional libarchive files to include in the distribution
-libarchive_EXTRA_DIST=		\
-	libarchive/test/list.h	\
+libarchive_EXTRA_DIST=			\
+	libarchive/test/list.h		\
+	libarchive/archive_windows.c	\
+	libarchive/archive_windows.h	\
 	$(libarchive_man_MANS)
 
 #
diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 2be0487db..9bc21e4de 100644
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -78,13 +78,9 @@
 #define	chdir		_chdir
 #define	chmod		_chmod
 #define	close		_close
-#define	dup			_dup
-#define	dup2			_dup2
-#define	execlp		_execlp
 #define	fileno		_fileno
 #define	fstat		_fstat
 #define	lseek		_lseek
-#define	lstat		_stat
 #define	open			_open
 #define	stat			_stat
 #define	mkdir(d,m)	_mkdir(d)
@@ -92,7 +88,6 @@
 #define	read			_read
 #define	rmdir		_rmdir
 #define	strdup		_strdup
-#define	stricmp		_stricmp
 #define	tzset		_tzset
 #define	umask		_umask
 #define	write		_write
@@ -124,8 +119,6 @@
 /* replace stat and seek by their large-file equivalents */
 #undef	stat
 #define   stat		_stati64
-#undef	lstat
-#define   lstat	_stati64
 #undef	fstat
 #define   fstat	_fstati64
 
@@ -151,7 +144,6 @@ extern "C" {
 
 extern int link (const char *from, const char *to);
 extern int symlink (const char *from, const char *to);
-extern int fcntl (int fd, int cmd, ...);
 
 #ifdef __cplusplus
 }