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...
This commit is contained in:
Nicholas Marriott 2009-08-26 09:10:47 +00:00
parent 6b4ed722b1
commit 1a5aba47c7
2 changed files with 14 additions and 14 deletions

View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -24,6 +24,18 @@
#include "tmux.h" #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. * Create a new session and attach to the current terminal unless -d is given.
*/ */

View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -87,18 +87,6 @@ typedef uint64_t u_int64_t;
#include "compat/vis.h" #include "compat/vis.h"
#endif #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 #ifndef HAVE_IMSG
#include "compat/imsg.h" #include "compat/imsg.h"
#endif #endif