From 59c13133dee99e821ab2fcdd5ca196f5752c9262 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sun, 16 May 2010 17:50:31 +0000
Subject: [PATCH] Fix bad merge, from Romain Francoise.

---
 server.c | 17 +----------------
 tmux.c   | 17 ++++++++---------
 2 files changed, 9 insertions(+), 25 deletions(-)

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 <nicm@users.sourceforge.net>
@@ -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]);
 
diff --git a/tmux.c b/tmux.c
index b890b362..6a4e11d7 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.207 2010-05-14 14:30:01 tcunha Exp $ */
+/* $Id: tmux.c,v 1.208 2010-05-16 17:50:31 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -540,14 +540,6 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	ev_base = event_init();
-	set_signals(main_signal);
-
-	/* Initialise the client socket/start the server. */
-	if ((main_ibuf = client_init(path, cmdflags, flags)) == NULL)
-		exit(1);
-	xfree(path);
-
 #ifdef HAVE_BROKEN_KQUEUE
 	if (setenv("EVENT_NOKQUEUE", "1", 1) != 0)
 		fatal("setenv failed");
@@ -556,12 +548,19 @@ main(int argc, char **argv)
 	if (setenv("EVENT_NOPOLL", "1", 1) != 0)
 		fatal("setenv failed");
 #endif
+	ev_base = event_init();
 #ifdef HAVE_BROKEN_KQUEUE
 	unsetenv("EVENT_NOKQUEUE");
 #endif
 #ifdef HAVE_BROKEN_POLL
 	unsetenv("EVENT_NOPOLL");
 #endif
+	set_signals(main_signal);
+
+	/* Initialise the client socket/start the server. */
+	if ((main_ibuf = client_init(path, cmdflags, flags)) == NULL)
+		exit(1);
+	xfree(path);
 
 	imsg_compose(main_ibuf, msg, PROTOCOL_VERSION, -1, -1, buf, len);