aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-05-13 23:27:00 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-05-13 23:27:00 +0000
commitc8cf438d44f7a4cd6700dbf9621329bffd960bf5 (patch)
tree7959216ce7a758ca94acbd13881ee6f434590916 /window.c
parente1b4a377222c53a186de6dabca5cb0068a1c7738 (diff)
downloadrtmux-c8cf438d44f7a4cd6700dbf9621329bffd960bf5.tar.gz
rtmux-c8cf438d44f7a4cd6700dbf9621329bffd960bf5.tar.bz2
rtmux-c8cf438d44f7a4cd6700dbf9621329bffd960bf5.zip
Rename all feature flags to HAVE_* and move out of makefiles into a configure
script which must be run before building. Still two makefiles but they are a hell of a lot simpler. HAVE_* also will make it easier to move to $buildsystem if necessary later.
Diffstat (limited to 'window.c')
-rw-r--r--window.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/window.c b/window.c
index 4e99c550..07214b78 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.73 2009-05-04 17:58:27 nicm Exp $ */
+/* $Id: window.c,v 1.74 2009-05-13 23:27:00 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,24 +28,24 @@
#include <termios.h>
#include <unistd.h>
-#ifndef NO_PATHS_H
+#include "tmux.h"
+
+#ifdef HAVE_PATHS_H
#include <paths.h>
#endif
-#ifdef USE_LIBUTIL_H
+#ifdef HAVE_FORKPTY
+#ifdef HAVE_LIBUTIL_H
#include <libutil.h>
-#else
+#endif
#ifdef USE_PTY_H
#include <pty.h>
-#else
-#ifndef NO_FORKPTY
-#include <util.h>
#endif
+#ifdef HAVE_UTIL_H
+#include <util.h>
#endif
#endif
-#include "tmux.h"
-
/*
* Each window is attached to one or two panes, each of which is a pty. This
* file contains code to handle them.