From ac68212ee96ae67980464e65c16a888610311394 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 16 Dec 2004 00:11:01 +0000 Subject: [PATCH] renamed the 'fd_set' variable to 'fdset'. former name causes problems with certain FD_* implementations (reported by Adrian Reyer) git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1769 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/keep-ctx-alive.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util-vserver/src/keep-ctx-alive.c b/util-vserver/src/keep-ctx-alive.c index b1d6fc6..3ad5d00 100644 --- a/util-vserver/src/keep-ctx-alive.c +++ b/util-vserver/src/keep-ctx-alive.c @@ -131,7 +131,7 @@ doit(char const *filename, struct timeval *timeout) int fd; struct sockaddr_un sock; pid_t pid; - fd_set fd_set; + fd_set fdset; ENSC_INIT_UNIX_SOCK(sock, filename); @@ -141,13 +141,13 @@ doit(char const *filename, struct timeval *timeout) printXid(1); - FD_ZERO(&fd_set); - FD_SET(fd, &fd_set); + FD_ZERO(&fdset); + FD_SET(fd, &fdset); pid = Efork(); if (pid==0) { - Eselect(fd+1, &fd_set, 0,0, timeout); - if (FD_ISSET(fd, &fd_set)) handleMessage(fd); + Eselect(fd+1, &fdset, 0,0, timeout); + if (FD_ISSET(fd, &fdset)) handleMessage(fd); exit(1); } -- 1.8.1.5