From 1a5aba47c742844fc17526ac27d5a162250f7fec Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 26 Aug 2009 09:10:47 +0000
Subject: [PATCH] ttydefchars is a fucking horlicks. Happily we only need it in
 one file, move it in there to avoid multiple inclusion issues.

Perhaps it would be better to pass NULL through to forkpty in the default
case...
---
 cmd-new-session.c | 14 +++++++++++++-
 compat.h          | 14 +-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cmd-new-session.c b/cmd-new-session.c
index 30e6892a..ebe41533 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.61 2009-08-24 16:31:26 tcunha Exp $ */
+/* $Id: cmd-new-session.c,v 1.62 2009-08-26 09:10:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,6 +24,18 @@
 
 #include "tmux.h"
 
+#ifdef HAVE_TTYDEFAULTS_H
+#ifdef HAVE_TTYDEFCHARS
+#define TTYDEFCHARS
+#endif
+#include <sys/ttydefaults.h>
+#else
+#ifndef OXTABS
+#define OXTABS 0
+#endif
+#include "compat/ttydefaults.h"
+#endif
+
 /*
  * Create a new session and attach to the current terminal unless -d is given.
  */
diff --git a/compat.h b/compat.h
index a630d962..1b0b7ab6 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $Id: compat.h,v 1.14 2009-08-20 12:49:18 nicm Exp $ */
+/* $Id: compat.h,v 1.15 2009-08-26 09:10:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -87,18 +87,6 @@ typedef uint64_t u_int64_t;
 #include "compat/vis.h"
 #endif
 
-#ifdef HAVE_TTYDEFAULTS_H
-#ifdef HAVE_TTYDEFCHARS
-#define TTYDEFCHARS
-#endif
-#include <sys/ttydefaults.h>
-#else
-#ifndef OXTABS
-#define OXTABS 0
-#endif
-#include "compat/ttydefaults.h"
-#endif
-
 #ifndef HAVE_IMSG
 #include "compat/imsg.h"
 #endif