From 00c7780fcb3f1503481663beb60b1c6e0d2447db Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 5 Jan 2006 07:57:32 +0000 Subject: [PATCH] James Bursa fixes: find the hosts file on RISC OS, and made it build with newer gcc versions that no longer defines "riscos". --- ares/CHANGES | 5 +++++ ares/ares_init.c | 2 +- ares/ares_private.h | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ares/CHANGES b/ares/CHANGES index 4374b9f4d..f4d4676d5 100644 --- a/ares/CHANGES +++ b/ares/CHANGES @@ -1,5 +1,10 @@ Changelog for the c-ares project +* January 5, 2006 + +- James Bursa fixed c-ares to find the hosts file on RISC OS, and made it + build with newer gcc versions that no longer defines "riscos". + * December 22 - Daniel Stenberg added ares_getsock() that extracts the set of sockets to diff --git a/ares/ares_init.c b/ares/ares_init.c index f97f70157..a6a672343 100644 --- a/ares/ares_init.c +++ b/ares/ares_init.c @@ -504,7 +504,7 @@ DhcpNameServer if (status == ARES_SUCCESS) status = ARES_EOF; -#elif defined(riscos) +#elif defined(__riscos__) /* Under RISC OS, name servers are listed in the system variable Inet$Resolvers, space separated. */ diff --git a/ares/ares_private.h b/ares/ares_private.h index 83b77d2a4..df51266dc 100644 --- a/ares/ares_private.h +++ b/ares/ares_private.h @@ -62,6 +62,10 @@ #define PATH_RESOLV_CONF "sys:/etc/resolv.cfg" #define PATH_HOSTS "sys:/etc/hosts" +#elif defined(__riscos__) + +#define PATH_HOSTS "InetDBase:Hosts" + #else #define PATH_RESOLV_CONF "/etc/resolv.conf"