Fixed puts, baudrate abd ospeed macros.

SCCS-vsn: lib/libcurses/curses.h 5.11

diff --git a/usr/src/lib/libcurses/curses.h b/usr/src/lib/libcurses/curses.h
index 7923aeb..aaf821f 100644 (file)
--- a/usr/src/lib/libcurses/curses.h
+++ b/usr/src/lib/libcurses/curses.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)curses.h    5.10 (Berkeley) %G%
+ *     @(#)curses.h    5.11 (Berkeley) %G%

  */
 
 #ifndef _CURSES_H_
  */
 
 #ifndef _CURSES_H_


@@ -29,16 +29,16 @@
 #define        FALSE   (0)
 #endif
 
 #define        FALSE   (0)
 #endif
 

-#define        _puts(s)        tputs(s, 0, _putchar)
+#define        _puts(s)        tputs(s, 0, __cputchar)

 #define        _putchar(c)     __cputchar(c)
 
 /* Old-style terminal modes access. */
 #define        _putchar(c)     __cputchar(c)
 
 /* Old-style terminal modes access. */

-#define        baudrate()      (cfgetospeed(origtermio))
+#define        baudrate()      (cfgetospeed(&origtermio))

 #define        crmode()        cbreak()
 #define        erasechar()     (origtermio.c_cc[VERASE])
 #define        killchar()      (origtermio.c_cc[VKILL])
 #define        nocrmode()      nocbreak()
 #define        crmode()        cbreak()
 #define        erasechar()     (origtermio.c_cc[VERASE])
 #define        killchar()      (origtermio.c_cc[VKILL])
 #define        nocrmode()      nocbreak()

-#define        ospeed          (cfgetospeed(origtermio))
+#define        ospeed          (cfgetospeed(&origtermio))

 #endif /* _CURSES_PRIVATE */
 
 extern int      My_term;               /* Use Def_term regardless. */
 #endif /* _CURSES_PRIVATE */
 
 extern int      My_term;               /* Use Def_term regardless. */