summaryrefslogtreecommitdiff
path: root/evdns.c
diff options
context:
space:
mode:
authorroot <root>2007-11-03 19:41:55 +0000
committerroot <root>2007-11-03 19:41:55 +0000
commit2c478454e9a3a21bdc62c7f46b02149795888437 (patch)
tree38dd02f524e16080587ed2910bde70a808ff7bd2 /evdns.c
parentb8c10cda08d48348f422bb3d31f019584cf252c9 (diff)
try to programmatically integrate libevent
Diffstat (limited to 'evdns.c')
-rw-r--r--evdns.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/evdns.c b/evdns.c
index 78fbd3c..3224cce 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.6 2007-11-03 19:41:55 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,7 @@
#endif
#ifdef WIN32
+#include "misc.h"
#endif
/* #define NDEBUG */
@@ -94,6 +94,7 @@
#include <stdarg.h>
#include "evdns.h"
+#include "log.h"
#ifdef WIN32
#include <windows.h>
#include <winsock2.h>
@@ -2546,7 +2547,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 +2623,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)) {