diff options
| author | Per Bothner <per@bothner.com> | 1994-02-15 22:31:19 +0000 |
|---|---|---|
| committer | Per Bothner <per@bothner.com> | 1994-02-15 22:31:19 +0000 |
| commit | f550cec5b1461950b9f3bea04cb89263143171c5 (patch) | |
| tree | 62fc7aee62d2c4edb136845f1ad79d07973fcef4 /readline/rldefs.h | |
| parent | 848743c1b688d0764c4293e635318b9d052040b5 (diff) | |
| download | gdb-f550cec5b1461950b9f3bea04cb89263143171c5.zip gdb-f550cec5b1461950b9f3bea04cb89263143171c5.tar.gz gdb-f550cec5b1461950b9f3bea04cb89263143171c5.tar.bz2 | |
* readline.c (_rl_output_character_function), display.c:
Return int, not void, to conform with the expected arg of tputs.
* readline.c (init_terminal_io): tgetflag only takes 1 arg.
* readline.c (_rl_savestring): New function.
* chardefs.h: To avoid conflicts and/or warnings, define
savestring as a macro wrapper for _rl_savestring.
* display.c (extern term_xn): It's an int flag, not a string.
* charsdefs.h, rldefs.h: Remove HAVE_STRING_H-related junk.
Diffstat (limited to 'readline/rldefs.h')
| -rw-r--r-- | readline/rldefs.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/readline/rldefs.h b/readline/rldefs.h index 83411bc..cdda2b8 100644 --- a/readline/rldefs.h +++ b/readline/rldefs.h @@ -49,13 +49,15 @@ #endif /* __linux__ */ /* Some USG machines have BSD signal handling (sigblock, sigsetmask, etc.) */ -#if defined (USG) && !defined (hpux) +/* CYGNUS LOCAL accept __hpux as well as hpux for HP compiler in ANSI mode. */ +#if defined (USG) && !(defined (hpux) || defined (__hpux)) # undef HAVE_BSD_SIGNALS #endif /* System V machines use termio. */ #if !defined (_POSIX_VERSION) -# if defined (USG) || defined (hpux) || defined (Xenix) || defined (sgi) || defined (DGUX) +/* CYGNUS LOCAL accept __hpux as well as hpux for HP compiler in ANSI mode. */ +# if defined (USG) || defined (hpux) || defined (__hpux) || defined (Xenix) || defined (sgi) || defined (DGUX) # undef NEW_TTY_DRIVER # define TERMIO_TTY_DRIVER # include <termio.h> @@ -150,21 +152,6 @@ #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) #endif -/* Decide which flavor of the header file describing the C library - string functions to include and include it. */ - -#if defined (USG) || defined (NeXT) -# if !defined (HAVE_STRING_H) -# define HAVE_STRING_H -# endif /* !HAVE_STRING_H */ -#endif /* USG || NeXT */ - -#if defined (HAVE_STRING_H) -# include <string.h> -#else /* !HAVE_STRING_H */ -# include <strings.h> -#endif /* !HAVE_STRING_H */ - #if !defined (strchr) && !defined (__STDC__) extern char *strchr (), *strrchr (); #endif /* !strchr && !__STDC__ */ |