41 lines
1.4 KiB
Plaintext
41 lines
1.4 KiB
Plaintext
$OpenBSD: patch-src_proxy_c,v 1.6 2004/06/25 20:52:10 brad Exp $
|
|
--- src/proxy.c.orig 2004-06-06 22:00:57.000000000 -0600
|
|
+++ src/proxy.c 2004-06-25 13:20:21.000000000 -0600
|
|
@@ -318,7 +318,7 @@ static void host_resolved(gpointer data,
|
|
int rc, err;
|
|
GSList *hosts = NULL;
|
|
struct sockaddr *addr = NULL;
|
|
- size_t addrlen;
|
|
+ socklen_t addrlen;
|
|
|
|
gaim_debug(GAIM_DEBUG_INFO, "dns", "Host '%s' resolved\n", req->host);
|
|
gaim_input_remove(req->inpa);
|
|
@@ -386,7 +386,7 @@ static void trap_gdb_bug()
|
|
fputs("\n* * *\n",stderr);
|
|
fputs(message,stderr);
|
|
fputs("* * *\n\n",stderr);
|
|
- execlp("xmessage","xmessage","-center", message, NULL);
|
|
+ execlp("xmessage","xmessage","-center", message, (void *)NULL);
|
|
_exit(1);
|
|
}
|
|
|
|
@@ -480,7 +480,7 @@ int gaim_gethostbyname_async(const char
|
|
char servname[20];
|
|
#else
|
|
struct sockaddr_in sin;
|
|
- const size_t addrlen = sizeof(sin);
|
|
+ const socklen_t addrlen = sizeof(sin);
|
|
#endif
|
|
#ifdef HAVE_SIGNAL_H
|
|
signal(SIGHUP, SIG_DFL);
|
|
@@ -549,8 +549,7 @@ int gaim_gethostbyname_async(const char
|
|
write(child_out[1], &zero, sizeof(zero));
|
|
tmp = res;
|
|
while(res) {
|
|
- size_t ai_addrlen = res->ai_addrlen;
|
|
- write(child_out[1], &ai_addrlen, sizeof(ai_addrlen));
|
|
+ write(child_out[1], &(res->ai_addrlen), sizeof(res->ai_addrlen));
|
|
write(child_out[1], res->ai_addr, res->ai_addrlen);
|
|
res = res->ai_next;
|
|
}
|