Mercurial > emacs
changeset 19023:f7a3c16c49cb
[HAVE_LIBNCURSES]: Declare ospeed as short, unless NCURSES_OSPEED_T.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 28 Jul 1997 17:04:18 +0000 |
| parents | 904dcdbb8576 |
| children | 72cca5d525f6 |
| files | src/cm.h src/sysdep.c src/terminfo.c |
| diffstat | 3 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cm.h Mon Jul 28 15:46:57 1997 +0000 +++ b/src/cm.h Mon Jul 28 17:04:18 1997 +0000 @@ -101,6 +101,9 @@ extern struct cm Wcm; /* Terminal capabilities */ extern char PC; /* Pad character */ +#if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T) +extern short ospeed; +#else #if defined (HAVE_TERMIOS_H) && defined (LINUX) #include <termios.h> /* HJL's version of libc is said to need this on the Alpha. @@ -109,6 +112,7 @@ #else extern short ospeed; /* Output speed (from sg_ospeed) */ #endif +#endif /* Shorthand */ #ifndef NoCMShortHand
--- a/src/sysdep.c Mon Jul 28 15:46:57 1997 +0000 +++ b/src/sysdep.c Mon Jul 28 17:04:18 1997 +0000 @@ -226,6 +226,9 @@ }; #endif +#if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T) +extern short ospeed; +#else #if defined (HAVE_TERMIOS_H) && defined (LINUX) #include <termios.h> /* HJL's version of libc is said to need this on the Alpha. @@ -234,6 +237,7 @@ #else extern short ospeed; #endif +#endif /* The file descriptor for Emacs's input terminal. Under Unix, this is normally zero except when using X;
--- a/src/terminfo.c Mon Jul 28 15:46:57 1997 +0000 +++ b/src/terminfo.c Mon Jul 28 17:04:18 1997 +0000 @@ -26,6 +26,9 @@ char *UP, *BC, PC; +#if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T) +short ospeed; +#else #if defined (HAVE_TERMIOS_H) && defined (LINUX) #include <termios.h> /* HJL's version of libc is said to need this on the Alpha. @@ -34,6 +37,7 @@ #else short ospeed; #endif +#endif static buffer[512];