Don't use _getcwd and _strdup on Borland C Compiler.

This is covering r1757.

SVN-Revision: 1762

diff --git a/cpio/test/test.h b/cpio/test/test.h
index ca54b9f862d5ef44c24f17efc22a3415518e8ef3..2d5a86348923d310db8326d786e71b6b3d2ca2d0 100644 (file)
--- a/cpio/test/test.h
+++ b/cpio/test/test.h
@@ -83,7 +83,9 @@
 /* Windows (including Visual Studio and MinGW but not Cygwin) */
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include "../cpio_windows.h"
+#if !defined(__BORLANDC__)
 #define strdup _strdup
+#endif
 #define LOCALE_DE      "deu"
 #else
 #define LOCALE_DE      "de_DE.UTF-8"

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index d02d4f96e332c73f01a55e2a44f3e58b30f3a95d..11c1c7833679bbef148778b6ddc83c3baef08860 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -85,7 +85,9 @@
 
 /* Windows (including Visual Studio and MinGW but not Cygwin) */
 #if defined(_WIN32) && !defined(__CYGWIN__)
+#if !defined(__BORLANDC__)
 #define strdup _strdup
+#endif
 #define        LOCALE_UTF8     NULL
 #else
 #define LOCALE_UTF8    "de_DE.UTF-8"

diff --git a/libarchive_fe/line_reader.c b/libarchive_fe/line_reader.c
index 21e1c705682f158be6400ea0a83331c1aff6cdff..4af60de4c07e7116b49465a4cbbd9de0b2aa28f4 100644 (file)
--- a/libarchive_fe/line_reader.c
+++ b/libarchive_fe/line_reader.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "err.h"
 #include "line_reader.h"
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
 #define strdup _strdup
 #endif
 

diff --git a/tar/bsdtar_windows.h b/tar/bsdtar_windows.h
index 6480ac30c2158ce9405508a446dade393124c815..51c0959b230f91a62732b94022963cbde6cacc93 100644 (file)
--- a/tar/bsdtar_windows.h
+++ b/tar/bsdtar_windows.h
@@ -40,9 +40,13 @@
 #endif
 
 #include <string.h>  /* Must include before redefining 'strdup' */
+#if !defined(__BORLANDC__)
 #define strdup _strdup
+#endif
 #define        read _read
+#if !defined(__BORLANDC__)
 #define getcwd _getcwd
+#endif
 
 #define chdir __tar_chdir
 int __tar_chdir(const char *);

diff --git a/tar/test/test.h b/tar/test/test.h
index ac5940227ff4a39bfc178312ff980c2997c3de70..d6a9275a8f1e25ff3893b0abe48ab8c078aa0803 100644 (file)
--- a/tar/test/test.h
+++ b/tar/test/test.h
@@ -83,7 +83,9 @@
 /* Windows (including Visual Studio and MinGW but not Cygwin) */
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include "../bsdtar_windows.h"
+#if !defined(__BORLANDC__)
 #define strdup _strdup
+#endif
 #define LOCALE_DE      "deu"
 #else
 #define LOCALE_DE      "de_DE.UTF-8"