diff options
author | Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> | 2010-03-16 10:31:46 -0400 |
---|---|---|
committer | Sadrul Habib Chowdhury <sadrul@users.sourceforge.net> | 2010-03-16 10:31:46 -0400 |
commit | ad5e07310ad8474358334fcff8de86d0b9ab6cad (patch) | |
tree | f46a86bf622cdc7c711d3428a9a292fde584d2ba /src/os.h | |
parent | f823083eee6bb3bf4c52cc2b32b1617bf291b1c0 (diff) | |
parent | 8a6abbab0161e6df1cea2ae0033a4c7f4a47f8e9 (diff) | |
download | screen-ad5e07310ad8474358334fcff8de86d0b9ab6cad.tar.gz |
Merge branch 'master' into cmd-aliascmd-alias
Diffstat (limited to 'src/os.h')
-rw-r--r-- | src/os.h | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* Copyright (c) 2008 +/* Copyright (c) 2008, 2009 * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) * Micah Cowan (micah@cowan.name) @@ -24,7 +24,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * **************************************************************** - * $Id$ FAU + * $Id$ GNU */ #include <stdio.h> @@ -41,7 +41,7 @@ # include <signal.h> #endif /* __bsdi__ || __386BSD__ || _CX_UX || hpux || _IBMR2 || linux */ -#ifndef HAVE_LONG_FILE_NAMES +#if !defined(HAVE_LONG_FILE_NAMES) && !defined(NAME_MAX) #define NAME_MAX 14 #endif @@ -234,11 +234,6 @@ extern int errno; # undef TIOCPKT #endif -/* linux ncurses is broken, we have to use our own tputs */ -#if defined(linux) && defined(TERMINFO) -# define tputs xtputs -#endif - /* Alexandre Oliva: SVR4 style ptys don't work with osf */ #ifdef __osf__ # undef HAVE_SVR4_PTYS |