summaryrefslogtreecommitdiffstats
path: root/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-10-31 14:26:26 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-10-31 14:26:26 +0000
commit08d9f46aae69e942a5db9a20463c27ac3c0ebbb8 (patch)
tree9eb92bf6763c7f24c0c1a4003b39f650f60b33d6 /window.c
parent48ad0431fb46871cb4a045b275c36ff524cc0fa0 (diff)
Make it build/run on Linux.
Diffstat (limited to 'window.c')
-rw-r--r--window.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/window.c b/window.c
index 5965b5ed..9a737547 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.24 2007-10-26 12:29:07 nicm Exp $ */
+/* $Id: window.c,v 1.25 2007-10-31 14:26:26 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,8 +31,12 @@
#ifdef USE_LIBUTIL_H
#include <libutil.h>
#else
+#ifdef USE_PTY_H
+#include <pty.h>
+#else
#include <util.h>
#endif
+#endif
#include "tmux.h"
@@ -153,7 +157,7 @@ winlink_previous(struct winlinks *wwl, struct winlink *wl)
struct window *
window_create(
- const char *name, const char *cmd, const char **environ, u_int sx, u_int sy)
+ const char *name, const char *cmd, const char **env, u_int sx, u_int sy)
{
struct window *w;
struct winsize ws;
@@ -169,7 +173,7 @@ window_create(
case -1:
return (NULL);
case 0:
- for (entry = environ; *entry != NULL; entry++) {
+ for (entry = env; *entry != NULL; entry++) {
if (putenv(*entry) != 0)
fatal("putenv failed");
}