From 59c13133dee99e821ab2fcdd5ca196f5752c9262 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 16 May 2010 17:50:31 +0000 Subject: Fix bad merge, from Romain Francoise. --- server.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index 96a668b4..4e120ae5 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.240 2010-05-14 14:30:01 tcunha Exp $ */ +/* $Id: server.c,v 1.241 2010-05-16 17:50:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -168,21 +168,6 @@ server_start(char *path) setproctitle("server (%s)", rpathbuf); #endif -#ifdef HAVE_BROKEN_KQUEUE - if (setenv("EVENT_NOKQUEUE", "1", 1) != 0) - fatal("setenv failed"); -#endif -#ifdef HAVE_BROKEN_POLL - if (setenv("EVENT_NOPOLL", "1", 1) != 0) - fatal("setenv failed"); -#endif -#ifdef HAVE_BROKEN_KQUEUE - unsetenv("EVENT_NOKQUEUE"); -#endif -#ifdef HAVE_BROKEN_POLL - unsetenv("EVENT_NOPOLL"); -#endif - server_fd = server_create_socket(); server_client_create(pair[1]); -- cgit