diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2009-12-18 11:55:49 -0500 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2009-12-18 11:55:49 -0500 |
| commit | c8caf069d0356d363986d884805d7e57121fa24c (patch) | |
| tree | bdf0096ec7f797190c02668af3f4a5472d357bef | |
| parent | cd9fa96733277247c283caa441cf54c14d646dca (diff) | |
| download | libarchive-c8caf069d0356d363986d884805d7e57121fa24c.tar.gz | |
Don't use _getcwd and _strdup on Borland C Compiler.
This is covering r1757.
SVN-Revision: 1762
| -rw-r--r-- | cpio/test/test.h | 2 | ||||
| -rw-r--r-- | libarchive/test/test.h | 2 | ||||
| -rw-r--r-- | libarchive_fe/line_reader.c | 2 | ||||
| -rw-r--r-- | tar/bsdtar_windows.h | 4 | ||||
| -rw-r--r-- | tar/test/test.h | 2 |
5 files changed, 11 insertions, 1 deletions
diff --git a/cpio/test/test.h b/cpio/test/test.h index ca54b9f8..2d5a8634 100644 --- 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 d02d4f96..11c1c783 100644 --- 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 21e1c705..4af60de4 100644 --- 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 6480ac30..51c0959b 100644 --- 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 ac594022..d6a9275a 100644 --- 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" |