diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-05-16 17:50:31 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-05-16 17:50:31 +0000 |
| commit | 59c13133dee99e821ab2fcdd5ca196f5752c9262 (patch) | |
| tree | 3a437564637d276606aa82fa6cb36382e32d7335 | |
| parent | 41afc38dcccef23476ebddc07afb968be720b71a (diff) | |
| download | rtmux-59c13133dee99e821ab2fcdd5ca196f5752c9262.tar.gz rtmux-59c13133dee99e821ab2fcdd5ca196f5752c9262.tar.bz2 rtmux-59c13133dee99e821ab2fcdd5ca196f5752c9262.zip | |
Fix bad merge, from Romain Francoise.
| -rw-r--r-- | server.c | 17 | ||||
| -rw-r--r-- | tmux.c | 17 |
2 files changed, 9 insertions, 25 deletions
@@ -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]); @@ -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); |