d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Just use autoconf-compatible feature macros; don't try to be clever.

Browse Source
This commit is contained in:
Tim Kientzle 2004-03-22 05:17:23 +00:00
parent b0487aaa20
commit 999103b3db
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libarchive/archive_platform.h
View File

@ -49,7 +49,7 @@
#define HAVE_CHFLAGS 1 #define HAVE_CHFLAGS 1
#define HAVE_LUTIMES 1 #define HAVE_LUTIMES 1
#define HAVE_LCHMOD 1 #define HAVE_LCHMOD 1
#define HAVE_POSIX_STRERROR_R 1 #define HAVE_STRERROR_R 1
#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE #define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
#define ARCHIVE_ERRNO_PROGRAMMER EINVAL #define ARCHIVE_ERRNO_PROGRAMMER EINVAL
#define ARCHIVE_ERRNO_MISC (-1) #define ARCHIVE_ERRNO_MISC (-1)
@ -86,7 +86,8 @@
#define st_atimespec st_atim #define st_atimespec st_atim
#define st_mtimespec st_mtim #define st_mtimespec st_mtim
#define st_ctimespec st_ctim #define st_ctimespec st_ctim
#define HAVE_GLIBC_STRERROR_R 1 #define HAVE_STRERROR_R 1
#define STRERROR_R_CHAR_P 1
#endif #endif
/* /*

8
lib/libarchive/archive_util.c
View File

@ -83,7 +83,9 @@ void
archive_set_error(struct archive *a, int error_number, const char *fmt, ...) archive_set_error(struct archive *a, int error_number, const char *fmt, ...)
{ {
va_list ap; va_list ap;
#ifdef HAVE_STRERROR_R
char errbuff[512]; char errbuff[512];
#endif
char *errp; char *errp;
a->archive_error_number = error_number; a->archive_error_number = error_number;
@ -96,11 +98,13 @@ archive_set_error(struct archive *a, int error_number, const char *fmt, ...)
archive_string_vsprintf(&(a->error_string), fmt, ap); archive_string_vsprintf(&(a->error_string), fmt, ap);
if(error_number > 0) { if(error_number > 0) {
archive_strcat(&(a->error_string), ": "); archive_strcat(&(a->error_string), ": ");
#if defined(HAVE_GLIBC_STRERROR_R) #ifdef HAVE_STRERROR_R
#ifdef STRERROR_R_CHAR_P
errp = strerror_r(error_number, errbuff, sizeof(errbuff)); errp = strerror_r(error_number, errbuff, sizeof(errbuff));
#elif defined(HAVE_POSIX_STRERROR_R) #else
strerror_r(error_number, errbuff, sizeof(errbuff)); strerror_r(error_number, errbuff, sizeof(errbuff));
errp = errbuff; errp = errbuff;
#endif
#else #else
/* Note: this is not threadsafe! */ /* Note: this is not threadsafe! */
errp = strerror(error_number); errp = strerror(error_number);