add rpid/rstatus

[software/libev.git] / evdns.c

diff --git a/evdns.c b/evdns.c
index 6541fc888e878f8488e47a89af4a122f34e62fe2..78fbd3c64f3e1218871a44e207351f00b12fb742 100644 (file)
--- a/evdns.c
+++ b/evdns.c
@@ -1,4 +1,5 @@
-/* $Id: evdns.c,v 1.1 2007-11-01 15:46:43 root Exp $ */
+#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
+#define HAVE_STRUCT_IN6_ADDR 1
 
 /* The original version of this module was written by Adam Langley; for
  * a history of modifications, check out the subversion logs.
@@ -40,7 +41,6 @@
 #endif
 
 #ifdef WIN32
-#include "misc.h"
 #endif
 
 /* #define NDEBUG */
@@ -94,7 +94,6 @@
 #include <stdarg.h>
 
 #include "evdns.h"
-/*#include "log.h"*/
 #ifdef WIN32
 #include <windows.h>
 #include <winsock2.h>
@@ -2267,7 +2266,7 @@ int evdns_resolve_reverse(struct in_addr *in, int flags, evdns_callback_type cal
 }
 
 int evdns_resolve_reverse_ipv6(struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr) {
-       char buf[64];
+       char buf[96];
        char *cp;
        struct request *req;
        int i;
@@ -2547,7 +2546,7 @@ evdns_resolv_set_defaults(int flags) {
 
 #ifndef HAVE_STRTOK_R
 static char *
-strtok_r(char *s, const char *delim, char **state) {
+fake_strtok_r(char *s, const char *delim, char **state) {
        return strtok(s, delim);
 }
 #endif
@@ -2623,9 +2622,9 @@ static void
 resolv_conf_parse_line(char *const start, int flags) {
        char *strtok_state;
        static const char *const delims = " \t";
-#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state)
+#define NEXT_TOKEN fake_strtok_r(NULL, delims, &strtok_state)
 
-       char *const first_token = strtok_r(start, delims, &strtok_state);
+       char *const first_token = fake_strtok_r(start, delims, &strtok_state);
        if (!first_token) return;
 
        if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {