From 7a873a8f1284058c968c5d8026fbde7867913cb5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Apr 2008 12:36:18 -0500 Subject: Give libalpm native support for both libdownload and libfetch This should remove the need for any additional patching to run on platforms that have libfetch available but not libdownload. It isn't the prettiest, but we have kept our libdownload impact down to just a few files, so it can be easily done. Signed-off-by: Dan McGee --- lib/libalpm/error.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'lib/libalpm/error.c') diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 30e9cf86..7c30cd09 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -19,8 +19,22 @@ #include "config.h" -#if defined(INTERNAL_DOWNLOAD) +/* TODO: needed for the libfetch stuff, unfortunately- we should kill it */ +#include +#include +/* the following two are needed on BSD for libfetch */ +#if defined(HAVE_SYS_SYSLIMITS_H) +#include /* PATH_MAX */ +#endif +#if defined(HAVE_SYS_PARAM_H) +#include /* MAXHOSTNAMELEN */ +#endif + +#if defined(HAVE_LIBDOWNLOAD) #include /* downloadLastErrString */ +#elif defined(HAVE_LIBFETCH) +#include /* fetchLastErrString */ +#define downloadLastErrString fetchLastErrString #endif /* libalpm */ @@ -145,7 +159,7 @@ const char SYMEXPORT *alpm_strerror(int err) return downloadLastErrString; #else /* obviously shouldn't get here... */ - return _("libdownload error"); + return _("download library error"); #endif case PM_ERR_EXTERNAL_DOWNLOAD: return _("error invoking external downloader"); -- cgit v1.2.3-24-g4f1b