Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libcurses/curses_private.h,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libcurses/curses_private.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.28 retrieving revision 1.30 diff -u -p -r1.28 -r1.30 --- src/lib/libcurses/curses_private.h 2003/01/27 21:09:20 1.28 +++ src/lib/libcurses/curses_private.h 2003/04/05 10:06:59 1.30 @@ -1,4 +1,4 @@ -/* $NetBSD: curses_private.h,v 1.28 2003/01/27 21:09:20 jdc Exp $ */ +/* $NetBSD: curses_private.h,v 1.30 2003/04/05 10:06:59 jdc Exp $ */ /*- * Copyright (c) 1998-2000 Brett Lymn @@ -99,7 +99,8 @@ struct __window { /* Window structure. int begy, begx; /* Window home. */ int cury, curx; /* Current x, y coordinates. */ int maxy, maxx; /* Maximum values for curx, cury. */ - short ch_off; /* x offset for firstch/lastch. */ + int reqy, reqx; /* Size requested when created */ + int ch_off; /* x offset for firstch/lastch. */ __LINE **lines; /* Array of pointers to the lines */ __LINE *lspace; /* line space (for cleanup) */ __LDATA *wspace; /* window space (for cleanup) */ @@ -164,7 +165,7 @@ struct __screen { WINDOW *stdscr; /* Standard screen. */ WINDOW *__virtscr; /* Virtual screen (for doupdate()). */ int curwin; /* current window for refresh */ - short lx, ly; /* loop parameters for refresh */ + int lx, ly; /* loop parameters for refresh */ int COLS; /* Columns on the screen. */ int LINES; /* Lines on the screen. */ int COLORS; /* Maximum colors on the screen */ @@ -226,6 +227,7 @@ struct __screen { int echoit; int pfast; int rawmode; + int nl; int noqch; int clearok; int useraw; @@ -254,7 +256,7 @@ extern SCREEN *_cursesi_screen; /* Private functions. */ #ifdef DEBUG -void __CTRACE(const char *, ...); +void __CTRACE(const char *, ...) __attribute__((__format__(__printf__, 1, 0))); #endif void __cputchar_args(char, void *); void _cursesi_free_keymap(keymap_t *);