Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21286
Modified Files:
server.c tmux.c
Log Message:
Fix bad merge, from Romain Francoise.
Index: server.c
===================================================================
RCS file: /cvsroot/tmux/tmux/server.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- server.c 14 May 2010 14:30:01 -0000 1.240
+++ server.c 16 May 2010 17:50:31 -0000 1.241
@@ -168,21 +168,6 @@
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]);
Index: tmux.c
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- tmux.c 14 May 2010 14:30:01 -0000 1.207
+++ tmux.c 16 May 2010 17:50:31 -0000 1.208
@@ -540,14 +540,6 @@
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 @@
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);
------------------------------------------------------------------------------
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
