>From nobody Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Wed Jan 18 14:02:54 2006 +0100 Subject: fix compilation of sockaddr_storage --- Makefile | 2 +- daemon.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 59379c380a6c2829c5614aadd4a5492abb8d14c8 diff --git a/Makefile b/Makefile index f6d9e0a..5782e2a 100644 --- a/Makefile +++ b/Makefile @@ -342,7 +342,7 @@ ifdef NO_MMAP COMPAT_OBJS += compat/mmap.o endif ifdef NO_IPV6 - ALL_CFLAGS += -DNO_IPV6 -Dsockaddr_storage=sockaddr_in + ALL_CFLAGS += -DNO_IPV6 -Dsockaddr_stg_git=sockaddr_in endif ifdef PPC_SHA1 diff --git a/daemon.c b/daemon.c index bb014fa..b424e5e 100644 --- a/daemon.c +++ b/daemon.c @@ -277,7 +277,7 @@ static unsigned int children_deleted = 0 static struct child { pid_t pid; int addrlen; - struct sockaddr_storage address; + struct sockaddr_stg_git address; } live_child[MAX_CHILDREN]; static void add_child(int idx, pid_t pid, struct sockaddr *addr, int addrlen) @@ -578,7 +578,7 @@ static int service_loop(int socknum, int for (i = 0; i < socknum; i++) { if (pfd[i].revents & POLLIN) { - struct sockaddr_storage ss; + struct sockaddr_stg_git ss; unsigned int sslen = sizeof(ss); int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen); if (incoming < 0) { -- 1.1.2-ge577