diff options
Diffstat (limited to 'contrib/texinfo/info/termdep.h')
| -rw-r--r-- | contrib/texinfo/info/termdep.h | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/contrib/texinfo/info/termdep.h b/contrib/texinfo/info/termdep.h index 4f8ce90..fc0f992 100644 --- a/contrib/texinfo/info/termdep.h +++ b/contrib/texinfo/info/termdep.h @@ -1,10 +1,10 @@ /* termdep.h -- System things that terminal.c depends on. - $Id: termdep.h,v 1.3 1996/10/02 22:23:52 karl Exp $ + $Id: termdep.h,v 1.3 1997/07/05 21:17:14 karl Exp $ This file is part of GNU Info, a program for reading online documentation stored in Info format. - Copyright (C) 1993, 96 Free Software Foundation, Inc. + Copyright (C) 1993, 96, 97 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,28 +22,16 @@ Written by Brian Fox (bfox@ai.mit.edu). */ -#if !defined (_TERMDEP_H_) -# define _TERMDEP_H_ +#ifndef INFO_TERMDEP_H +#define INFO_TERMDEP_H -#if defined (HAVE_SYS_FCNTL_H) -# include <sys/fcntl.h> -#else -# include <fcntl.h> -#endif /* !HAVE_SYS_FCNTL_H */ - -#if defined (HAVE_SYS_FILE_H) -# include <sys/file.h> -#endif /* HAVE_SYS_FILE_H */ - -#if defined (HAVE_STRINGS_H) -# include <strings.h> -#else -# if defined (HAVE_STRING_H) -# include <string.h> -# endif +/* NeXT supplies <termios.h> but it is broken. Probably Autoconf should + have a separate test, but anyway ... */ +#ifdef NeXT +#undef HAVE_TERMIOS_H #endif -#if defined (HAVE_TERMIOS_H) +#ifdef HAVE_TERMIOS_H # include <termios.h> #else # if defined (HAVE_TERMIO_H) @@ -62,15 +50,8 @@ # endif /* !HAVE_TERMIO_H */ #endif /* !HAVE_TERMIOS_H */ -#if defined (HAVE_SYS_TTOLD_H) +#ifdef HAVE_SYS_TTOLD_H # include <sys/ttold.h> #endif /* HAVE_SYS_TTOLD_H */ -#if !defined (HAVE_STRCHR) -# undef strchr -# undef strrchr -# define strchr index -# define strrchr rindex -#endif /* !HAVE_STRCHR */ - -#endif /* _TERMDEP_H_ */ +#endif /* not INFO_TERMDEP_H */ |
