X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/f123911c49df152e9b27ab4df77b12a03b6abfa2..f776d56f36abeed4a6091c2ec9b96363213ce2b2:/evdns.c?ds=inline diff --git a/evdns.c b/evdns.c index 78fbd3c..f8ef2a1 100644 --- a/evdns.c +++ b/evdns.c @@ -1,5 +1,4 @@ -#define DNS_USE_GETTIMEOFDAY_FOR_ID 1 -#define HAVE_STRUCT_IN6_ADDR 1 +/* $Id: evdns.c,v 1.10 2007-11-04 18:29:44 root Exp $ */ /* The original version of this module was written by Adam Langley; for * a history of modifications, check out the subversion logs. @@ -41,6 +40,9 @@ #endif #ifdef WIN32 +#ifndef EV_EMBED +#include "misc.h" +#endif #endif /* #define NDEBUG */ @@ -2546,7 +2548,7 @@ evdns_resolv_set_defaults(int flags) { #ifndef HAVE_STRTOK_R static char * -fake_strtok_r(char *s, const char *delim, char **state) { +strtok_r(char *s, const char *delim, char **state) { return strtok(s, delim); } #endif @@ -2622,9 +2624,9 @@ static void resolv_conf_parse_line(char *const start, int flags) { char *strtok_state; static const char *const delims = " \t"; -#define NEXT_TOKEN fake_strtok_r(NULL, delims, &strtok_state) +#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state) - char *const first_token = fake_strtok_r(start, delims, &strtok_state); + char *const first_token = strtok_r(start, delims, &strtok_state); if (!first_token) return; if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {