Compatibility fix to satisfy libg++

diff --git a/lib/libcurses/addch.c b/lib/libcurses/addch.c
index a045c87..cf1743a 100644 (file)
--- a/lib/libcurses/addch.c
+++ b/lib/libcurses/addch.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)addch.c   8.1 (Berkeley) 6/4/93";
 int
 waddch(win, ch)
        WINDOW *win;
 int
 waddch(win, ch)
        WINDOW *win;

-       int ch;
+       char ch;

 {
        __LDATA buf;
 
 {
        __LDATA buf;
 

diff --git a/lib/libcurses/box.c b/lib/libcurses/box.c
index 4da2303..3059cba 100644 (file)
--- a/lib/libcurses/box.c
+++ b/lib/libcurses/box.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)box.c     8.1 (Berkeley) 6/4/93";
 int
 box(win, vert, hor)
        register WINDOW *win;
 int
 box(win, vert, hor)
        register WINDOW *win;

-       int vert, hor;
+       char vert, hor;

 {
        register int endy, endx, i;
        register __LDATA *fp, *lp;
 {
        register int endy, endx, i;
        register __LDATA *fp, *lp;

diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index 106ed09..357476f 100644 (file)
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -100,6 +100,10 @@
 /* WINDOW structure members name compatibility */
 #define _curx   curx
 #define _cury   cury
 /* WINDOW structure members name compatibility */
 #define _curx   curx
 #define _cury   cury

+#define _begx   begx
+#define _begy   begy
+#define _maxx   maxx
+#define _maxy   maxy

 
 #endif /* _CURSES_PRIVATE */
 
 
 #endif /* _CURSES_PRIVATE */
 


@@ -267,7 +271,7 @@ extern char *ttytype;               /* Full name of current terminal. */
        ((w)->lines[(w)->cury]->line[(w)->curx].ch & 0xff)
 
 /* Public function prototypes. */
        ((w)->lines[(w)->cury]->line[(w)->curx].ch & 0xff)
 
 /* Public function prototypes. */

-int     box __P((WINDOW *, int, int));
+int      box __P((WINDOW *, char, char));

 int     cbreak __P((void));
 int     delwin __P((WINDOW *));
 int     echo __P((void));
 int     cbreak __P((void));
 int     delwin __P((WINDOW *));
 int     echo __P((void));


@@ -307,7 +311,7 @@ int  touchoverlap __P((WINDOW *, WINDOW *));
 int     touchwin __P((WINDOW *));
 int     vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_));
 int      vwscanw __P((WINDOW *, const char *, _BSD_VA_LIST_));
 int     touchwin __P((WINDOW *));
 int     vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_));
 int      vwscanw __P((WINDOW *, const char *, _BSD_VA_LIST_));

-int     waddch __P((WINDOW *, int));
+int      waddch __P((WINDOW *, char));

 int     waddnstr __P((WINDOW *, const char *, int));
 int     wclear __P((WINDOW *));
 int     wclrtobot __P((WINDOW *));
 int     waddnstr __P((WINDOW *, const char *, int));
 int     wclear __P((WINDOW *));
 int     wclrtobot __P((WINDOW *));


@@ -317,14 +321,14 @@ int        wdeleteln __P((WINDOW *));
 int     werase __P((WINDOW *));
 int     wgetch __P((WINDOW *));
 int     wgetstr __P((WINDOW *, char *));
 int     werase __P((WINDOW *));
 int     wgetch __P((WINDOW *));
 int     wgetstr __P((WINDOW *, char *));

-int     winsch __P((WINDOW *, int));
+int      winsch __P((WINDOW *, char));

 int     winsertln __P((WINDOW *));
 int     wmove __P((WINDOW *, int, int));
 int     wprintw __P((WINDOW *, const char *, ...));
 int     wrefresh __P((WINDOW *));
 int     wscanw __P((WINDOW *, const char *, ...));
 int     winsertln __P((WINDOW *));
 int     wmove __P((WINDOW *, int, int));
 int     wprintw __P((WINDOW *, const char *, ...));
 int     wrefresh __P((WINDOW *));
 int     wscanw __P((WINDOW *, const char *, ...));

-char   *wstandend __P((WINDOW *));
-char   *wstandout __P((WINDOW *));
+int      wstandend __P((WINDOW *));
+int      wstandout __P((WINDOW *));

 int     vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_));
 
 /* Private functions that are needed for user programs prototypes. */
 int     vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_));
 
 /* Private functions that are needed for user programs prototypes. */

diff --git a/lib/libcurses/insch.c b/lib/libcurses/insch.c
index 41b7383..e960b58 100644 (file)
--- a/lib/libcurses/insch.c
+++ b/lib/libcurses/insch.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)insch.c   8.1 (Berkeley) 6/4/93";
 int
 winsch(win, ch)
        register WINDOW *win;
 int
 winsch(win, ch)
        register WINDOW *win;

-       int ch;
+       char ch;

 {
 
        register __LDATA *end, *temp1, *temp2;
 {
 
        register __LDATA *end, *temp1, *temp2;


@@ -67,6 +67,7 @@ winsch(win, ch)
                        wrefresh(win);
                        scroll(win);
                        win->cury--;
                        wrefresh(win);
                        scroll(win);
                        win->cury--;

+

                } else
                        return (ERR);
        return (OK);
                } else
                        return (ERR);
        return (OK);

diff --git a/lib/libcurses/standout.c b/lib/libcurses/standout.c
index 907184b..14a983d 100644 (file)
--- a/lib/libcurses/standout.c
+++ b/lib/libcurses/standout.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)standout.c        8.1 (Berkeley) 6/4/93";
  * wstandout
  *     Enter standout mode.
  */
  * wstandout
  *     Enter standout mode.
  */

-char *
+int

 wstandout(win)
        register WINDOW *win;
 {
 wstandout(win)
        register WINDOW *win;
 {


@@ -49,14 +49,14 @@ wstandout(win)
                return (0);
 
        win->flags |= __WSTANDOUT;
                return (0);
 
        win->flags |= __WSTANDOUT;

-       return (SO ? SO : UC);
+       return (1);

 }
 
 /*
  * wstandend --
  *     Exit standout mode.
  */
 }
 
 /*
  * wstandend --
  *     Exit standout mode.
  */

-char *
+int

 wstandend(win)
        register WINDOW *win;
 {
 wstandend(win)
        register WINDOW *win;
 {


@@ -64,5 +64,5 @@ wstandend(win)
                return (0);
 
        win->flags &= ~__WSTANDOUT;
                return (0);
 
        win->flags &= ~__WSTANDOUT;

-       return (SE ? SE : UC);
+       return (1);

 }
 }