From: Karl Heuer Date: Mon, 15 Jul 1996 21:53:24 +0000 (+0000) Subject: [HAVE_TERMIOS_H]: Declare ospeed as speed_t. X-Git-Tag: emacs-19.34~171 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f2655f5f967b70e8d9ded9274387bd07c88f356;p=emacs.git [HAVE_TERMIOS_H]: Declare ospeed as speed_t. --- diff --git a/src/cm.h b/src/cm.h index 80e945b4607..f5c8157f5e7 100644 --- a/src/cm.h +++ b/src/cm.h @@ -100,7 +100,12 @@ struct cm extern struct cm Wcm; /* Terminal capabilities */ extern char PC; /* Pad character */ +#ifdef HAVE_TERMIOS_H +# include +extern speed_t ospeed; +#else extern short ospeed; /* Output speed (from sg_ospeed) */ +#endif /* Shorthand */ #ifndef NoCMShortHand diff --git a/src/sysdep.c b/src/sysdep.c index 5baf95c92b5..cf6850c20d1 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -220,7 +220,12 @@ static int baud_convert[] = }; #endif -extern short ospeed; +#ifdef HAVE_TERMIOS_H +# include + extern speed_t ospeed; +#else + extern short ospeed; +#endif /* The file descriptor for Emacs's input terminal. Under Unix, this is normally zero except when using X;