* Applied patch by mrg to remove variable names from function

prototypes to prevent name space collisions.
This commit is contained in:
blymn 2000-05-11 12:05:39 +00:00
parent 2222d240a7
commit fc196e1de6
1 changed files with 92 additions and 95 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: curses.h,v 1.46 2000/05/01 12:30:30 blymn Exp $ */ /* $NetBSD: curses.h,v 1.47 2000/05/11 12:05:39 blymn Exp $ */
/* /*
* Copyright (c) 1981, 1993, 1994 * Copyright (c) 1981, 1993, 1994
@ -487,77 +487,75 @@ __END_DECLS
/* Public function prototypes. */ /* Public function prototypes. */
__BEGIN_DECLS __BEGIN_DECLS
int beep(void); int beep(void);
int box(WINDOW *win, chtype vert, chtype horiz); int box(WINDOW *, chtype, chtype);
bool can_change_colors(void); bool can_change_colors(void);
int cbreak(void); int cbreak(void);
int clearok(WINDOW *win, bool flag); int clearok(WINDOW *, bool);
int color_content(short colour, short *redp, short *greenp, short *bluep); int color_content(short, short *, short *, short *);
int copywin(const WINDOW *srcwin, WINDOW *dstwin, int sminrow, int copywin(const WINDOW *, WINDOW *, int, int, int, int, int, int, int);
int smincol, int dminrow, int dmincol, int dmaxrow, int curs_set(int);
int dmaxcol, int overlay);
int curs_set(int visibility);
int def_prog_mode(void); int def_prog_mode(void);
int def_shell_mode(void); int def_shell_mode(void);
int delwin(WINDOW *win); int delwin(WINDOW *);
WINDOW *derwin(WINDOW *orig, int nlines, int ncols, int by, int bx); WINDOW *derwin(WINDOW *, int, int, int, int);
WINDOW *dupwin(WINDOW *win); WINDOW *dupwin(WINDOW *);
int doupdate(void); int doupdate(void);
int echo(void); int echo(void);
int endwin(void); int endwin(void);
char erasechar(void); char erasechar(void);
int flash(void); int flash(void);
int flushinp(void); int flushinp(void);
int flushok(WINDOW *win, bool bf); int flushok(WINDOW *, bool);
char *fullname(const char *bp, char *def); char *fullname(const char *, char *);
chtype getbkgd(WINDOW *win); chtype getbkgd(WINDOW *);
char *getcap(char *name); char *getcap(char *);
int getcury(WINDOW *win); int getcury(WINDOW *);
int getcurx(WINDOW *win); int getcurx(WINDOW *);
int getbegy(WINDOW *win); int getbegy(WINDOW *);
int getbegx(WINDOW *win); int getbegx(WINDOW *);
int getmaxy(WINDOW *win); int getmaxy(WINDOW *);
int getmaxx(WINDOW *win); int getmaxx(WINDOW *);
int gettmode(void); int gettmode(void);
bool has_colors(void); bool has_colors(void);
int hline(chtype ch, int count); int hline(chtype, int);
int idlok(WINDOW *win, bool bf); int idlok(WINDOW *, bool);
int init_color(short colour, short red, short green, short blue); int init_color(short, short, short, short);
int init_pair(short pair, short fore, short back); int init_pair(short, short, short);
WINDOW *initscr(void); WINDOW *initscr(void);
int intrflush(WINDOW *win, bool bf); int intrflush(WINDOW *, bool);
bool isendwin(void); bool isendwin(void);
bool is_linetouched(WINDOW *win, int line); bool is_linetouched(WINDOW *, int);
bool is_wintouched(WINDOW *win); bool is_wintouched(WINDOW *);
void keypad(WINDOW *win, bool bf); void keypad(WINDOW *, bool);
char killchar(void); char killchar(void);
int leaveok(WINDOW *win, bool bf); int leaveok(WINDOW *, bool);
char *longname(void); char *longname(void);
int meta(WINDOW *win, bool bf); int meta(WINDOW *, bool);
int mvcur(int ly, int lx, int y, int x); int mvcur(int, int, int, int);
int mvhline(int y, int x, chtype ch, int count); int mvhline(int, int, chtype, int);
int mvprintw(int y, int x, const char *fmt, ...) int mvprintw(int, int, const char *, ...)
__attribute__((__format__(__printf__, 3, 4))); __attribute__((__format__(__printf__, 3, 4)));
int mvscanw(int y, int x, const char *fmt, ...) int mvscanw(int, int, const char *, ...)
__attribute__((__format__(__scanf__, 3, 4))); __attribute__((__format__(__scanf__, 3, 4)));
int mvvline(int y, int x, chtype ch, int count); int mvvline(int, int, chtype, int);
int mvwhline(WINDOW *win, int y, int x, chtype ch, int count); int mvwhline(WINDOW *, int, int, chtype, int);
int mvwvline(WINDOW *win, int y, int x, chtype ch, int count); int mvwvline(WINDOW *, int, int, chtype, int);
int mvwin(WINDOW *win, int y, int x); int mvwin(WINDOW *, int, int);
int mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...) int mvwprintw(WINDOW *, int, int, const char *, ...)
__attribute__((__format__(__printf__, 4, 5))); __attribute__((__format__(__printf__, 4, 5)));
int mvwscanw(WINDOW *win, int y, int x, const char *fmt, ...) int mvwscanw(WINDOW *, int, int, const char *, ...)
__attribute__((__format__(__scanf__, 4, 5))); __attribute__((__format__(__scanf__, 4, 5)));
WINDOW *newwin(int nlines, int ncols, int by, int bx); WINDOW *newwin(int, int, int, int);
int nl(void); int nl(void);
int nocbreak(void); int nocbreak(void);
void nodelay(WINDOW *win, bool bf); void nodelay(WINDOW *, bool);
int noecho(void); int noecho(void);
int nonl(void); int nonl(void);
int noraw(void); int noraw(void);
int notimeout(WINDOW *win, bool bf); int notimeout(WINDOW *, bool);
int overlay(const WINDOW *win1, WINDOW *win2); int overlay(const WINDOW *, WINDOW *);
int overwrite(const WINDOW *win1, WINDOW *win2); int overwrite(const WINDOW *, WINDOW *);
int pair_content(short pair, short *forep, short *backp); int pair_content(short, short *, short *);
int printw(const char *, ...) int printw(const char *, ...)
__attribute__((__format__(__printf__, 1, 2))); __attribute__((__format__(__printf__, 1, 2)));
int raw(void); int raw(void);
@ -567,63 +565,62 @@ int resetty(void);
int savetty(void); int savetty(void);
int scanw(const char *, ...) int scanw(const char *, ...)
__attribute__((__format__(__scanf__, 1, 2))); __attribute__((__format__(__scanf__, 1, 2)));
int scroll(WINDOW *win); int scroll(WINDOW *);
int scrollok(WINDOW *win, bool bf); int scrollok(WINDOW *, bool);
int setterm(char *); int setterm(char *);
int start_color(void); int start_color(void);
WINDOW *subwin(WINDOW *orig, int nlines, int ncols, int by, int bx); WINDOW *subwin(WINDOW *, int, int, int, int);
int touchline(WINDOW *win, int start, int count); int touchline(WINDOW *, int, int);
int touchoverlap(WINDOW *win1, WINDOW *win2); int touchoverlap(WINDOW *, WINDOW *);
int touchwin(WINDOW *win); int touchwin(WINDOW *);
int ungetch(int c); int ungetch(int);
int untouchwin(WINDOW *win); int untouchwin(WINDOW *);
int vline(chtype ch, int count); int vline(chtype, int);
int vwprintw(WINDOW *win, const char *fmt, _BSD_VA_LIST_) int vwprintw(WINDOW *, const char *, _BSD_VA_LIST_)
__attribute__((__format__(__printf__, 2, 0))); __attribute__((__format__(__printf__, 2, 0)));
int vwscanw(WINDOW *win, const char *fmt, _BSD_VA_LIST_) int vwscanw(WINDOW *, const char *, _BSD_VA_LIST_)
__attribute__((__format__(__scanf__, 2, 0))); __attribute__((__format__(__scanf__, 2, 0)));
int waddch(WINDOW *win, chtype ch); int waddch(WINDOW *, chtype);
int waddnstr(WINDOW *win, const char *s, int n); int waddnstr(WINDOW *, const char *, int);
int wattron(WINDOW *win, int attr); int wattron(WINDOW *, int);
int wattroff(WINDOW *win, int attr); int wattroff(WINDOW *, int);
int wattrset(WINDOW *win, int attr); int wattrset(WINDOW *, int);
int wbkgd(WINDOW *win, chtype ch); int wbkgd(WINDOW *, chtype);
void wbkgdset(WINDOW *win, chtype ch); void wbkgdset(WINDOW *, chtype);
int wborder(WINDOW *win, chtype left, chtype right, chtype top, int wborder(WINDOW *, chtype, chtype, chtype, chtype, chtype, chtype,
chtype bottom, chtype topleft, chtype topright, chtype, chtype);
chtype botleft, chtype botright); int wclear(WINDOW *);
int wclear(WINDOW *win); int wclrtobot(WINDOW *);
int wclrtobot(WINDOW *win); int wclrtoeol(WINDOW *);
int wclrtoeol(WINDOW *win); int wdelch(WINDOW *);
int wdelch(WINDOW *win); int wdeleteln(WINDOW *);
int wdeleteln(WINDOW *win); int werase(WINDOW *);
int werase(WINDOW *win); int wgetch(WINDOW *);
int wgetch(WINDOW *win); int wgetstr(WINDOW *, char *);
int wgetstr(WINDOW *win, char *str); int whline(WINDOW *, chtype, int);
int whline(WINDOW *win, chtype ch, int count); chtype winch(WINDOW *);
chtype winch(WINDOW *win); int winsch(WINDOW *, chtype);
int winsch(WINDOW *win, chtype ch); int winsdelln(WINDOW *, int);
int winsdelln(WINDOW *win, int lines); int winsertln(WINDOW *);
int winsertln(WINDOW *win); int wmove(WINDOW *, int, int);
int wmove(WINDOW *win, int y, int x); int wnoutrefresh(WINDOW *);
int wnoutrefresh(WINDOW *win); int wprintw(WINDOW *, const char *, ...)
int wprintw(WINDOW *win, const char *fmt, ...)
__attribute__((__format__(__printf__, 2, 3))); __attribute__((__format__(__printf__, 2, 3)));
int wrefresh(WINDOW *win); int wrefresh(WINDOW *);
int wscanw(WINDOW *win, const char *fmt, ...) int wscanw(WINDOW *, const char *, ...)
__attribute__((__format__(__scanf__, 2, 3))); __attribute__((__format__(__scanf__, 2, 3)));
int wscrl(WINDOW *win, int lines); int wscrl(WINDOW *, int);
int wstandend(WINDOW *win); int wstandend(WINDOW *);
int wstandout(WINDOW *win); int wstandout(WINDOW *);
void wtimeout(WINDOW *win, int delay); void wtimeout(WINDOW *, int);
int wtouchln(WINDOW *win, int line, int n, int changed); int wtouchln(WINDOW *, int, int, int);
int wunderend(WINDOW *win); int wunderend(WINDOW *);
int wunderscore(WINDOW *win); int wunderscore(WINDOW *);
int wvline(WINDOW *win, chtype ch, int count); int wvline(WINDOW *, chtype, int);
/* Private functions that are needed for user programs prototypes. */ /* Private functions that are needed for user programs prototypes. */
int __cputchar(int); int __cputchar(int);
int __waddbytes(WINDOW *win, const char *bytes, int count, attr_t attr); int __waddbytes(WINDOW *, const char *, int, attr_t);
__END_DECLS __END_DECLS
#endif /* !_CURSES_H_ */ #endif /* !_CURSES_H_ */