From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 13 Dec 2009 00:07:42 +0000 (-0500)
Subject: Work around Borland C's broken _open() implementation.
X-Git-Tag: v2.8.0~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54b8eee6239fff04292ecfe552e1d3960a3225a2;p=thirdparty%2Flibarchive.git

Work around Borland C's broken _open() implementation.

SVN-Revision: 1729
---

diff --git a/libarchive/test/test_open_fd.c b/libarchive/test/test_open_fd.c
index 79cbba2ce..20ecd44c2 100644
--- a/libarchive/test/test_open_fd.c
+++ b/libarchive/test/test_open_fd.c
@@ -26,7 +26,11 @@
 __FBSDID("$FreeBSD$");
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
+#ifdef __BORLANDC__
+#define open(fn,mode,create)	_open(fn,mode)
+#else
 #define open _open
+#endif
 #define lseek _lseek
 #define close _close
 #endif
diff --git a/libarchive/test/test_read_data_large.c b/libarchive/test/test_read_data_large.c
index 9487485bd..06deb65ce 100644
--- a/libarchive/test/test_read_data_large.c
+++ b/libarchive/test/test_read_data_large.c
@@ -34,7 +34,11 @@ __FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_data_large.c,v 1.4 2008/09
  */
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
+#ifdef __BORLANDC__
+#define open(fn,mode,create)	_open(fn,mode)
+#else
 #define open _open
+#endif
 #define close _close
 #endif
 
diff --git a/libarchive/test/test_read_large.c b/libarchive/test/test_read_large.c
index 654ca7606..c8f93d5aa 100644
--- a/libarchive/test/test_read_large.c
+++ b/libarchive/test/test_read_large.c
@@ -30,7 +30,11 @@ static unsigned char testdatacopy[10 * 1024 * 1024];
 static unsigned char buff[11 * 1024 * 1024];
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
+#ifdef __BORLANDC__
+#define open(fn,mode,create)	_open(fn,mode)
+#else
 #define open _open
+#endif
 #define close _close
 #endif
 
diff --git a/tar/write.c b/tar/write.c
index 3d3cb54bf..7284b1e07 100644
--- a/tar/write.c
+++ b/tar/write.c
@@ -152,7 +152,11 @@ seek_file(int fd, int64_t offset, int whence)
 	return (SetFilePointerEx((HANDLE)_get_osfhandle(fd),
 		distance, NULL, FILE_BEGIN) ? 1 : -1);
 }
+#ifdef __BORLANDC__
+#define open(fn,mode,create)	_open(fn,mode)
+#else
 #define open _open
+#endif
 #define close _close
 #define read _read
 #define lseek seek_file