aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-11-15 22:49:25 +0000
committerThomas Adam <thomas@xteddy.org>2015-11-15 22:49:25 +0000
commit8213558cc77e6298e7f246ce3f45b5cd8af05a7b (patch)
treefddd40672e3a94d18c8955fa999213aad2054951 /tmux.c
parentbb820fa761747a2c5342f61c4fbe5368565ef9b3 (diff)
parenta582b622879714b0a100e8c7d3054f5a03476ca1 (diff)
downloadrtmux-8213558cc77e6298e7f246ce3f45b5cd8af05a7b.tar.gz
rtmux-8213558cc77e6298e7f246ce3f45b5cd8af05a7b.tar.bz2
rtmux-8213558cc77e6298e7f246ce3f45b5cd8af05a7b.zip
Merge branch 'obsd-master'
Conflicts: server.c tmux.c
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmux.c b/tmux.c
index 9e5ddb66..c88b119d 100644
--- a/tmux.c
+++ b/tmux.c
@@ -261,7 +261,7 @@ main(int argc, char **argv)
usage();
#ifdef __OpenBSD__
- if (0 && pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd "
+ if (pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd "
"proc exec tty ps", NULL) != 0)
err(1, "pledge");
#endif