[ViewVC] Diff of: cvs/libev/evdns.c

Comparing libev/evdns.c (file contents):
Revision 1.4 by root, Thu Nov 1 17:45:30 2007 UTC vs.
Revision 1.7 by root, Sat Nov 3 20:24:42 2007 UTC

-#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
+/* $Id: evdns.c,v 1.7 2007/11/03 20:24:42 root Exp $ */
-#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.
  *
  * When editing this module, try to keep it re-mergeable by Adam.  Don't
 #include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include "evdns.h"
+#include "log.h"
 #ifdef WIN32
 #include <windows.h>
 #include <winsock2.h>
 #include <iphlpapi.h>
 #else
 	if (flags & DNS_OPTION_NAMESERVERS) evdns_nameserver_ip_add("127.0.0.1");
 }
 #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
 /* helper version of atoi which returns -1 on error */
 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)) {
 		const char *const nameserver = NEXT_TOKEN;
 		struct in_addr ina;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines