diff --git a/curses.h b/curses.h index 73549846..080aa538 100644 --- a/curses.h +++ b/curses.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: curses.h,v 1.121 2006/02/04 19:35:05 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.122 2006/02/08 17:40:32 wmcbrine Exp $ */ /* ---------------------------------------------------------------------- PDCurses @@ -63,8 +63,6 @@ PDCurses portable platform definitions list: #define BSDcurses 1 /* BSD Curses routines */ #define CHTYPE_LONG 1 /* size of chtype; long */ -#define PDC_CDECL /* default define this as empty */ - /*---------------------------------------- * BORLAND COMPILERS Turbo C[++], Borland C[++] * @@ -312,10 +310,6 @@ PDCurses portable platform definitions list: # ifndef WIN32 # define WIN32 # endif -# ifdef PDC_CDECL -# undef PDC_CDECL -# define PDC_CDECL cdecl /* needed for compatibility to other systems */ -# endif # endif # ifndef HAVE_MEMORY_H # define HAVE_MEMORY_H /* have */ @@ -1204,311 +1198,311 @@ currently used.) /* Standard */ -int PDC_CDECL addch(const chtype); -int PDC_CDECL addchnstr(const chtype *, int); -int PDC_CDECL addchstr(const chtype *); -int PDC_CDECL addnstr(const char *, int); -int PDC_CDECL addstr(const char *); -int PDC_CDECL attroff(chtype); -int PDC_CDECL attron(chtype); -int PDC_CDECL attrset(chtype); -int PDC_CDECL baudrate(void); -int PDC_CDECL beep(void); -int PDC_CDECL bkgd(chtype); -void PDC_CDECL bkgdset(chtype); -int PDC_CDECL border(chtype, chtype, chtype, chtype, chtype, +int addch(const chtype); +int addchnstr(const chtype *, int); +int addchstr(const chtype *); +int addnstr(const char *, int); +int addstr(const char *); +int attroff(chtype); +int attron(chtype); +int attrset(chtype); +int baudrate(void); +int beep(void); +int bkgd(chtype); +void bkgdset(chtype); +int border(chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype); -int PDC_CDECL box(WINDOW *, chtype, chtype); -bool PDC_CDECL can_change_color(void); -int PDC_CDECL cbreak(void); -int PDC_CDECL clearok(WINDOW *, bool); -int PDC_CDECL clear(void); -int PDC_CDECL clrtobot(void); -int PDC_CDECL clrtoeol(void); -int PDC_CDECL color_content(short, short *, short *, short *); -chtype PDC_CDECL COLOR_PAIR(int); -int PDC_CDECL color_set(short, void *); -int PDC_CDECL copywin(const WINDOW *, WINDOW *, int, int, int, +int box(WINDOW *, chtype, chtype); +bool can_change_color(void); +int cbreak(void); +int clearok(WINDOW *, bool); +int clear(void); +int clrtobot(void); +int clrtoeol(void); +int color_content(short, short *, short *, short *); +chtype COLOR_PAIR(int); +int color_set(short, void *); +int copywin(const WINDOW *, WINDOW *, int, int, int, int, int, int, int); -int PDC_CDECL curs_set(int); -int PDC_CDECL def_prog_mode(void); -int PDC_CDECL def_shell_mode(void); -int PDC_CDECL delay_output(int); -int PDC_CDECL delch(void); -int PDC_CDECL deleteln(void); -void PDC_CDECL delscreen(SCREEN *); -int PDC_CDECL delwin(WINDOW *); -WINDOW* PDC_CDECL derwin(WINDOW *, int, int, int, int); -int PDC_CDECL doupdate(void); -WINDOW* PDC_CDECL dupwin(WINDOW *); -int PDC_CDECL echochar(const chtype); -int PDC_CDECL echo(void); -int PDC_CDECL endwin(void); -char PDC_CDECL erasechar(void); -int PDC_CDECL erase(void); -void PDC_CDECL filter(void); -int PDC_CDECL flash(void); -int PDC_CDECL flushinp(void); -chtype PDC_CDECL getbkgd(WINDOW *); -int PDC_CDECL getnstr(char *, int); -int PDC_CDECL getstr(char *); -WINDOW* PDC_CDECL getwin(FILE *); -int PDC_CDECL halfdelay(int); -bool PDC_CDECL has_colors(void); -bool PDC_CDECL has_ic(void); -bool PDC_CDECL has_il(void); -int PDC_CDECL hline(chtype, int); -void PDC_CDECL idcok(WINDOW *, bool); -int PDC_CDECL idlok(WINDOW *, bool); -void PDC_CDECL immedok(WINDOW *, bool); -int PDC_CDECL inchnstr(chtype *, int); -int PDC_CDECL inchstr(chtype *); -chtype PDC_CDECL inch(void); -int PDC_CDECL init_color(short, short, short, short); -int PDC_CDECL init_pair(short, short, short); -WINDOW* PDC_CDECL initscr(void); -int PDC_CDECL innstr(char *, int); -int PDC_CDECL insch(chtype); -int PDC_CDECL insdelln(int); -int PDC_CDECL insertln(void); -int PDC_CDECL insnstr(const char *, int); -int PDC_CDECL insstr(const char *); -int PDC_CDECL instr(char *); -int PDC_CDECL intrflush(WINDOW *, bool); -bool PDC_CDECL isendwin(void); -bool PDC_CDECL is_linetouched(WINDOW *, int); -bool PDC_CDECL is_wintouched(WINDOW *); -char * PDC_CDECL keyname(int); -int PDC_CDECL keypad(WINDOW *, bool); -char PDC_CDECL killchar(void); -int PDC_CDECL leaveok(WINDOW *, bool); -char * PDC_CDECL longname(void); -int PDC_CDECL meta(WINDOW *, bool); -int PDC_CDECL move(int, int); -int PDC_CDECL mvaddch(int, int, const chtype); -int PDC_CDECL mvaddchnstr(int, int, const chtype *, int); -int PDC_CDECL mvaddchstr(int, int, const chtype *); -int PDC_CDECL mvaddnstr(int, int, const char *, int); -int PDC_CDECL mvaddstr(int, int, const char *); -int PDC_CDECL mvcur(int, int, int, int); -int PDC_CDECL mvdelch(int, int); -int PDC_CDECL mvderwin(WINDOW *, int, int); -int PDC_CDECL mvgetch(int, int); -int PDC_CDECL mvgetnstr(int, int, char *, int); -int PDC_CDECL mvgetstr(int, int, char *); -int PDC_CDECL mvhline(int, int, chtype, int); -chtype PDC_CDECL mvinch(int, int); -int PDC_CDECL mvinchnstr(int, int, chtype *, int); -int PDC_CDECL mvinchstr(int, int, chtype *); -int PDC_CDECL mvinnstr(int, int, char *, int); -int PDC_CDECL mvinsch(int, int, chtype); -int PDC_CDECL mvinsnstr(int, int, const char *, int); -int PDC_CDECL mvinsstr(int, int, const char *); -int PDC_CDECL mvinstr(int, int, char *); -int PDC_CDECL mvprintw(int, int, char *, ...); -int PDC_CDECL mvscanw(int, int, char *, ...); -int PDC_CDECL mvvline(int, int, chtype, int); -int PDC_CDECL mvwaddchnstr(WINDOW *, int, int, const chtype *, int); -int PDC_CDECL mvwaddchstr(WINDOW *, int, int, const chtype *); -int PDC_CDECL mvwaddch(WINDOW *, int, int, const chtype); -int PDC_CDECL mvwaddnstr(WINDOW *, int, int, const char *, int); -int PDC_CDECL mvwaddstr(WINDOW *, int, int, const char *); -int PDC_CDECL mvwdelch(WINDOW *, int, int); -int PDC_CDECL mvwgetch(WINDOW *, int, int); -int PDC_CDECL mvwgetnstr(WINDOW *, int, int, char *, int); -int PDC_CDECL mvwgetstr(WINDOW *, int, int, char *); -int PDC_CDECL mvwhline(WINDOW *, int, int, chtype, int); -int PDC_CDECL mvwinchnstr(WINDOW *, int, int, chtype *, int); -int PDC_CDECL mvwinchstr(WINDOW *, int, int, chtype *); -chtype PDC_CDECL mvwinch(WINDOW *, int, int); -int PDC_CDECL mvwinnstr(WINDOW *, int, int, char *, int); -int PDC_CDECL mvwinsch(WINDOW *, int, int, chtype); -int PDC_CDECL mvwinsnstr(WINDOW *, int, int, const char *, int); -int PDC_CDECL mvwinsstr(WINDOW *, int, int, const char *); -int PDC_CDECL mvwinstr(WINDOW *, int, int, char *); -int PDC_CDECL mvwin(WINDOW *, int, int); -int PDC_CDECL mvwprintw(WINDOW *, int, int, char *, ...); -int PDC_CDECL mvwscanw(WINDOW *, int, int, char *, ...); -int PDC_CDECL mvwvline(WINDOW *, int, int, chtype, int); -int PDC_CDECL napms(int); -WINDOW* PDC_CDECL newpad(int, int); -SCREEN* PDC_CDECL newterm(char *, FILE *, FILE *); -WINDOW* PDC_CDECL newwin(int, int, int, int); -int PDC_CDECL nl(void); -int PDC_CDECL nocbreak(void); -int PDC_CDECL nodelay(WINDOW *, bool); -int PDC_CDECL noecho(void); -int PDC_CDECL nonl(void); -void PDC_CDECL noqiflush(void); -int PDC_CDECL noraw(void); -int PDC_CDECL notimeout(WINDOW *, bool); -int PDC_CDECL overlay(const WINDOW *, WINDOW *); -int PDC_CDECL overwrite(const WINDOW *, WINDOW *); -int PDC_CDECL pair_content(short, short *, short *); -int PDC_CDECL PAIR_NUMBER(chtype); -int PDC_CDECL pechochar(WINDOW *, chtype); -int PDC_CDECL pnoutrefresh(WINDOW *, int, int, int, int, int, int); -int PDC_CDECL prefresh(WINDOW *, int, int, int, int, int, int); -int PDC_CDECL printw(char *, ...); -int PDC_CDECL putwin(WINDOW *, FILE *); -void PDC_CDECL qiflush(void); -int PDC_CDECL raw(void); -int PDC_CDECL redrawwin(WINDOW *); -int PDC_CDECL refresh(void); -int PDC_CDECL reset_prog_mode(void); -int PDC_CDECL reset_shell_mode(void); -int PDC_CDECL resetty(void); -int PDC_CDECL ripoffline(int, int (*)(WINDOW *, int)); -int PDC_CDECL savetty(void); -int PDC_CDECL scanw(char *, ...); -int PDC_CDECL scr_dump(const char *); -int PDC_CDECL scr_init(const char *); -int PDC_CDECL scrl(int); -int PDC_CDECL scrollok(WINDOW *, bool); -int PDC_CDECL scroll(WINDOW *); -int PDC_CDECL scr_restore(const char *); -int PDC_CDECL scr_set(const char *); -int PDC_CDECL setscrreg(int, int); -SCREEN* PDC_CDECL set_term(SCREEN *); -int PDC_CDECL slk_attroff(const chtype); -int PDC_CDECL slk_attron(const chtype); -int PDC_CDECL slk_attrset(const chtype); -int PDC_CDECL slk_clear(void); -int PDC_CDECL slk_color(short); -int PDC_CDECL slk_init(int); -char * PDC_CDECL slk_label(int); -int PDC_CDECL slk_noutrefresh(void); -int PDC_CDECL slk_refresh(void); -int PDC_CDECL slk_restore(void); -int PDC_CDECL slk_set(int, const char *, int); -int PDC_CDECL slk_touch(void); -int PDC_CDECL standend(void); -int PDC_CDECL standout(void); -int PDC_CDECL start_color(void); -WINDOW* PDC_CDECL subpad(WINDOW *, int, int, int, int); -WINDOW* PDC_CDECL subwin(WINDOW *, int, int, int, int); -int PDC_CDECL syncok(WINDOW *, bool); -chtype PDC_CDECL termattrs(void); -char * PDC_CDECL termname(void); -void PDC_CDECL timeout(int); -int PDC_CDECL touchline(WINDOW *, int, int); -int PDC_CDECL touchwin(WINDOW *); -int PDC_CDECL typeahead(int); -int PDC_CDECL untouchwin(WINDOW *); -void PDC_CDECL use_env(bool); -int PDC_CDECL vidattr(chtype); -int PDC_CDECL vidputs(chtype, int (*)(int)); -int PDC_CDECL vline(chtype, int); -int PDC_CDECL vw_printw(WINDOW *, char *, va_list); -int PDC_CDECL vwprintw(WINDOW *, char *, va_list); -int PDC_CDECL vw_scanw(WINDOW *, char *, va_list); -int PDC_CDECL vwscanw(WINDOW *, char *, va_list); -int PDC_CDECL waddchnstr(WINDOW *, const chtype *, int); -int PDC_CDECL waddchstr(WINDOW *, const chtype *); -int PDC_CDECL waddch(WINDOW *, const chtype); -int PDC_CDECL waddnstr(WINDOW *, const char *, int); -int PDC_CDECL waddstr(WINDOW *, const char *); -int PDC_CDECL wattroff(WINDOW *, chtype); -int PDC_CDECL wattron(WINDOW *, chtype); -int PDC_CDECL wattrset(WINDOW *, chtype); -void PDC_CDECL wbkgdset(WINDOW *, chtype); -int PDC_CDECL wbkgd(WINDOW *, chtype); -int PDC_CDECL wborder(WINDOW *, chtype, chtype, chtype, chtype, +int curs_set(int); +int def_prog_mode(void); +int def_shell_mode(void); +int delay_output(int); +int delch(void); +int deleteln(void); +void delscreen(SCREEN *); +int delwin(WINDOW *); +WINDOW *derwin(WINDOW *, int, int, int, int); +int doupdate(void); +WINDOW *dupwin(WINDOW *); +int echochar(const chtype); +int echo(void); +int endwin(void); +char erasechar(void); +int erase(void); +void filter(void); +int flash(void); +int flushinp(void); +chtype getbkgd(WINDOW *); +int getnstr(char *, int); +int getstr(char *); +WINDOW *getwin(FILE *); +int halfdelay(int); +bool has_colors(void); +bool has_ic(void); +bool has_il(void); +int hline(chtype, int); +void idcok(WINDOW *, bool); +int idlok(WINDOW *, bool); +void immedok(WINDOW *, bool); +int inchnstr(chtype *, int); +int inchstr(chtype *); +chtype inch(void); +int init_color(short, short, short, short); +int init_pair(short, short, short); +WINDOW *initscr(void); +int innstr(char *, int); +int insch(chtype); +int insdelln(int); +int insertln(void); +int insnstr(const char *, int); +int insstr(const char *); +int instr(char *); +int intrflush(WINDOW *, bool); +bool isendwin(void); +bool is_linetouched(WINDOW *, int); +bool is_wintouched(WINDOW *); +char *keyname(int); +int keypad(WINDOW *, bool); +char killchar(void); +int leaveok(WINDOW *, bool); +char *longname(void); +int meta(WINDOW *, bool); +int move(int, int); +int mvaddch(int, int, const chtype); +int mvaddchnstr(int, int, const chtype *, int); +int mvaddchstr(int, int, const chtype *); +int mvaddnstr(int, int, const char *, int); +int mvaddstr(int, int, const char *); +int mvcur(int, int, int, int); +int mvdelch(int, int); +int mvderwin(WINDOW *, int, int); +int mvgetch(int, int); +int mvgetnstr(int, int, char *, int); +int mvgetstr(int, int, char *); +int mvhline(int, int, chtype, int); +chtype mvinch(int, int); +int mvinchnstr(int, int, chtype *, int); +int mvinchstr(int, int, chtype *); +int mvinnstr(int, int, char *, int); +int mvinsch(int, int, chtype); +int mvinsnstr(int, int, const char *, int); +int mvinsstr(int, int, const char *); +int mvinstr(int, int, char *); +int mvprintw(int, int, char *, ...); +int mvscanw(int, int, char *, ...); +int mvvline(int, int, chtype, int); +int mvwaddchnstr(WINDOW *, int, int, const chtype *, int); +int mvwaddchstr(WINDOW *, int, int, const chtype *); +int mvwaddch(WINDOW *, int, int, const chtype); +int mvwaddnstr(WINDOW *, int, int, const char *, int); +int mvwaddstr(WINDOW *, int, int, const char *); +int mvwdelch(WINDOW *, int, int); +int mvwgetch(WINDOW *, int, int); +int mvwgetnstr(WINDOW *, int, int, char *, int); +int mvwgetstr(WINDOW *, int, int, char *); +int mvwhline(WINDOW *, int, int, chtype, int); +int mvwinchnstr(WINDOW *, int, int, chtype *, int); +int mvwinchstr(WINDOW *, int, int, chtype *); +chtype mvwinch(WINDOW *, int, int); +int mvwinnstr(WINDOW *, int, int, char *, int); +int mvwinsch(WINDOW *, int, int, chtype); +int mvwinsnstr(WINDOW *, int, int, const char *, int); +int mvwinsstr(WINDOW *, int, int, const char *); +int mvwinstr(WINDOW *, int, int, char *); +int mvwin(WINDOW *, int, int); +int mvwprintw(WINDOW *, int, int, char *, ...); +int mvwscanw(WINDOW *, int, int, char *, ...); +int mvwvline(WINDOW *, int, int, chtype, int); +int napms(int); +WINDOW *newpad(int, int); +SCREEN *newterm(char *, FILE *, FILE *); +WINDOW *newwin(int, int, int, int); +int nl(void); +int nocbreak(void); +int nodelay(WINDOW *, bool); +int noecho(void); +int nonl(void); +void noqiflush(void); +int noraw(void); +int notimeout(WINDOW *, bool); +int overlay(const WINDOW *, WINDOW *); +int overwrite(const WINDOW *, WINDOW *); +int pair_content(short, short *, short *); +int PAIR_NUMBER(chtype); +int pechochar(WINDOW *, chtype); +int pnoutrefresh(WINDOW *, int, int, int, int, int, int); +int prefresh(WINDOW *, int, int, int, int, int, int); +int printw(char *, ...); +int putwin(WINDOW *, FILE *); +void qiflush(void); +int raw(void); +int redrawwin(WINDOW *); +int refresh(void); +int reset_prog_mode(void); +int reset_shell_mode(void); +int resetty(void); +int ripoffline(int, int (*)(WINDOW *, int)); +int savetty(void); +int scanw(char *, ...); +int scr_dump(const char *); +int scr_init(const char *); +int scrl(int); +int scrollok(WINDOW *, bool); +int scroll(WINDOW *); +int scr_restore(const char *); +int scr_set(const char *); +int setscrreg(int, int); +SCREEN *set_term(SCREEN *); +int slk_attroff(const chtype); +int slk_attron(const chtype); +int slk_attrset(const chtype); +int slk_clear(void); +int slk_color(short); +int slk_init(int); +char *slk_label(int); +int slk_noutrefresh(void); +int slk_refresh(void); +int slk_restore(void); +int slk_set(int, const char *, int); +int slk_touch(void); +int standend(void); +int standout(void); +int start_color(void); +WINDOW *subpad(WINDOW *, int, int, int, int); +WINDOW *subwin(WINDOW *, int, int, int, int); +int syncok(WINDOW *, bool); +chtype termattrs(void); +char *termname(void); +void timeout(int); +int touchline(WINDOW *, int, int); +int touchwin(WINDOW *); +int typeahead(int); +int untouchwin(WINDOW *); +void use_env(bool); +int vidattr(chtype); +int vidputs(chtype, int (*)(int)); +int vline(chtype, int); +int vw_printw(WINDOW *, char *, va_list); +int vwprintw(WINDOW *, char *, va_list); +int vw_scanw(WINDOW *, char *, va_list); +int vwscanw(WINDOW *, char *, va_list); +int waddchnstr(WINDOW *, const chtype *, int); +int waddchstr(WINDOW *, const chtype *); +int waddch(WINDOW *, const chtype); +int waddnstr(WINDOW *, const char *, int); +int waddstr(WINDOW *, const char *); +int wattroff(WINDOW *, chtype); +int wattron(WINDOW *, chtype); +int wattrset(WINDOW *, chtype); +void wbkgdset(WINDOW *, chtype); +int wbkgd(WINDOW *, chtype); +int wborder(WINDOW *, chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype); -int PDC_CDECL wclear(WINDOW *); -int PDC_CDECL wclrtobot(WINDOW *); -int PDC_CDECL wclrtoeol(WINDOW *); -int PDC_CDECL wcolor_set(WINDOW *, short, void *); -void PDC_CDECL wcursyncup(WINDOW *); -int PDC_CDECL wdelch(WINDOW *); -int PDC_CDECL wdeleteln(WINDOW *); -int PDC_CDECL wechochar(WINDOW *, const chtype); -int PDC_CDECL werase(WINDOW *); -int PDC_CDECL wgetch(WINDOW *); -int PDC_CDECL wgetnstr(WINDOW *, char *, int); -int PDC_CDECL wgetstr(WINDOW *, char *); -int PDC_CDECL whline(WINDOW *, chtype, int); -int PDC_CDECL winchnstr(WINDOW *, chtype *, int); -int PDC_CDECL winchstr(WINDOW *, chtype *); -chtype PDC_CDECL winch(WINDOW *); -int PDC_CDECL winnstr(WINDOW *, char *, int); -int PDC_CDECL winsch(WINDOW *, chtype); -int PDC_CDECL winsdelln(WINDOW *, int); -int PDC_CDECL winsertln(WINDOW *); -int PDC_CDECL winsnstr(WINDOW *, const char *, int); -int PDC_CDECL winsstr(WINDOW *, const char *); -int PDC_CDECL winstr(WINDOW *, char *); -int PDC_CDECL wmove(WINDOW *, int, int); -int PDC_CDECL wnoutrefresh(WINDOW *); -int PDC_CDECL wprintw(WINDOW *, char *, ...); -int PDC_CDECL wredrawln(WINDOW *, int, int); -int PDC_CDECL wrefresh(WINDOW *); -int PDC_CDECL wscanw(WINDOW *, char *, ...); -int PDC_CDECL wscrl(WINDOW *, int); -int PDC_CDECL wsetscrreg(WINDOW *, int, int); -int PDC_CDECL wstandend(WINDOW *); -int PDC_CDECL wstandout(WINDOW *); -void PDC_CDECL wsyncdown(WINDOW *); -void PDC_CDECL wsyncup(WINDOW *); -void PDC_CDECL wtimeout(WINDOW *, int); -int PDC_CDECL wtouchln(WINDOW *, int, int, int); -int PDC_CDECL wvline(WINDOW *, chtype, int); +int wclear(WINDOW *); +int wclrtobot(WINDOW *); +int wclrtoeol(WINDOW *); +int wcolor_set(WINDOW *, short, void *); +void wcursyncup(WINDOW *); +int wdelch(WINDOW *); +int wdeleteln(WINDOW *); +int wechochar(WINDOW *, const chtype); +int werase(WINDOW *); +int wgetch(WINDOW *); +int wgetnstr(WINDOW *, char *, int); +int wgetstr(WINDOW *, char *); +int whline(WINDOW *, chtype, int); +int winchnstr(WINDOW *, chtype *, int); +int winchstr(WINDOW *, chtype *); +chtype winch(WINDOW *); +int winnstr(WINDOW *, char *, int); +int winsch(WINDOW *, chtype); +int winsdelln(WINDOW *, int); +int winsertln(WINDOW *); +int winsnstr(WINDOW *, const char *, int); +int winsstr(WINDOW *, const char *); +int winstr(WINDOW *, char *); +int wmove(WINDOW *, int, int); +int wnoutrefresh(WINDOW *); +int wprintw(WINDOW *, char *, ...); +int wredrawln(WINDOW *, int, int); +int wrefresh(WINDOW *); +int wscanw(WINDOW *, char *, ...); +int wscrl(WINDOW *, int); +int wsetscrreg(WINDOW *, int, int); +int wstandend(WINDOW *); +int wstandout(WINDOW *); +void wsyncdown(WINDOW *); +void wsyncup(WINDOW *); +void wtimeout(WINDOW *, int); +int wtouchln(WINDOW *, int, int, int); +int wvline(WINDOW *, chtype, int); /* Quasi-standard */ -chtype PDC_CDECL getattrs(WINDOW *); -char * PDC_CDECL unctrl(chtype); +chtype getattrs(WINDOW *); +char *unctrl(chtype); -int PDC_CDECL mouse_set(unsigned long); -int PDC_CDECL mouse_on(unsigned long); -int PDC_CDECL mouse_off(unsigned long); -int PDC_CDECL request_mouse_pos(void); -int PDC_CDECL map_button(unsigned long); -void PDC_CDECL wmouse_position(WINDOW *, int *, int *); -unsigned long PDC_CDECL getmouse(void); -unsigned long PDC_CDECL getbmap(void); +int mouse_set(unsigned long); +int mouse_on(unsigned long); +int mouse_off(unsigned long); +int request_mouse_pos(void); +int map_button(unsigned long); +void wmouse_position(WINDOW *, int *, int *); +unsigned long getmouse(void); +unsigned long getbmap(void); /* NCurses */ -bool PDC_CDECL has_key(int); +bool has_key(int); /* PDCurses */ -int PDC_CDECL mvwinsertln(WINDOW *, int, int); -int PDC_CDECL raw_output(bool); -int PDC_CDECL resize_term(int, int); -WINDOW* PDC_CDECL resize_window(WINDOW *, int, int); -void PDC_CDECL traceoff(void); -void PDC_CDECL traceon(void); -char PDC_CDECL wordchar(void); +int mvwinsertln(WINDOW *, int, int); +int raw_output(bool); +int resize_term(int, int); +WINDOW *resize_window(WINDOW *, int, int); +void traceoff(void); +void traceon(void); +char wordchar(void); #ifdef XCURSES -WINDOW* PDC_CDECL Xinitscr(int, char **); -void PDC_CDECL XCursesExit(void); -int PDC_CDECL sb_init(void); -int PDC_CDECL sb_set_horz(int, int, int); -int PDC_CDECL sb_set_vert(int, int, int); -int PDC_CDECL sb_get_horz(int *, int *, int *); -int PDC_CDECL sb_get_vert(int *, int *, int *); -int PDC_CDECL sb_refresh(void); +WINDOW *Xinitscr(int, char **); +void XCursesExit(void); +int sb_init(void); +int sb_set_horz(int, int, int); +int sb_set_vert(int, int, int); +int sb_get_horz(int *, int *, int *); +int sb_get_vert(int *, int *, int *); +int sb_refresh(void); #endif -int PDC_CDECL PDC_chadd(WINDOW *, chtype, bool, bool); -int PDC_CDECL PDC_chins(WINDOW *, chtype, bool); -int PDC_CDECL PDC_ungetch(int); -void PDC_CDECL PDC_set_title(char *); -int PDC_CDECL PDC_getclipboard(char **, long *); -int PDC_CDECL PDC_setclipboard(char *, long); -int PDC_CDECL PDC_freeclipboard(char *); -int PDC_CDECL PDC_clearclipboard(void); +int PDC_chadd(WINDOW *, chtype, bool, bool); +int PDC_chins(WINDOW *, chtype, bool); +int PDC_ungetch(int); +void PDC_set_title(char *); +int PDC_getclipboard(char **, long *); +int PDC_setclipboard(char *, long); +int PDC_freeclipboard(char *); +int PDC_clearclipboard(void); -unsigned long PDC_CDECL PDC_get_input_fd(void); -unsigned long PDC_CDECL PDC_get_key_modifiers(void); +unsigned long PDC_get_input_fd(void); +unsigned long PDC_get_key_modifiers(void); -int PDC_CDECL PDC_wunderline(WINDOW *, int, bool); -int PDC_CDECL PDC_wleftline(WINDOW *, int, bool); -int PDC_CDECL PDC_wrightline(WINDOW *, int, bool); -int PDC_CDECL PDC_set_line_color(short); +int PDC_wunderline(WINDOW *, int, bool); +int PDC_wleftline(WINDOW *, int, bool); +int PDC_wrightline(WINDOW *, int, bool); +int PDC_set_line_color(short); #ifndef max # define max(a,b) (((a) > (b)) ? (a) : (b)) diff --git a/curspriv.h b/curspriv.h index d54c5b07..ca64dde1 100644 --- a/curspriv.h +++ b/curspriv.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: curspriv.h,v 1.30 2006/01/29 19:18:28 wmcbrine Exp $ */ +/* $Id: curspriv.h,v 1.31 2006/02/08 17:40:32 wmcbrine Exp $ */ /* CURSPRIV.H @@ -301,7 +301,7 @@ void movedata(unsigned, unsigned, unsigned, unsigned, unsigned); #endif #ifdef PDCDEBUG -void PDC_CDECL PDC_debug(char *, ...); +void PDC_debug(char *, ...); # define PDC_LOG(x) if (trace_on) PDC_debug x #else # define PDC_LOG(x) diff --git a/dos/pdcclip.c b/dos/pdcclip.c index b51a86c4..3e51efcd 100644 --- a/dos/pdcclip.c +++ b/dos/pdcclip.c @@ -23,7 +23,7 @@ #ifdef PDCDEBUG const char *rcsid_PDCclip = - "$Id: pdcclip.c,v 1.15 2006/02/06 02:54:27 wmcbrine Exp $"; + "$Id: pdcclip.c,v 1.16 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /* global clipboard contents, should be NULL if none set */ @@ -56,7 +56,7 @@ static char *pdc_DOS_clipboard = NULL; **man-end**********************************************************************/ -int PDC_CDECL PDC_getclipboard(char **contents, long *length) +int PDC_getclipboard(char **contents, long *length) { int len; @@ -97,7 +97,7 @@ int PDC_CDECL PDC_getclipboard(char **contents, long *length) **man-end**********************************************************************/ -int PDC_CDECL PDC_setclipboard(char *contents, long length) +int PDC_setclipboard(char *contents, long length) { PDC_LOG(("PDC_setclipboard() - called\n")); @@ -137,7 +137,7 @@ int PDC_CDECL PDC_setclipboard(char *contents, long length) **man-end**********************************************************************/ -int PDC_CDECL PDC_freeclipboard(char *contents) +int PDC_freeclipboard(char *contents) { PDC_LOG(("PDC_freeclipboard() - called\n")); @@ -179,7 +179,7 @@ int PDC_CDECL PDC_freeclipboard(char *contents) **man-end**********************************************************************/ -int PDC_CDECL PDC_clearclipboard(void) +int PDC_clearclipboard(void) { PDC_LOG(("PDC_clearclipboard() - called\n")); diff --git a/os2/pdcclip.c b/os2/pdcclip.c index 1a16c863..fc36bf87 100644 --- a/os2/pdcclip.c +++ b/os2/pdcclip.c @@ -27,7 +27,7 @@ #ifdef PDCDEBUG const char *rcsid_PDCclip = - "$Id: pdcclip.c,v 1.13 2006/02/06 02:54:27 wmcbrine Exp $"; + "$Id: pdcclip.c,v 1.14 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -57,7 +57,7 @@ const char *rcsid_PDCclip = **man-end**********************************************************************/ -int PDC_CDECL PDC_getclipboard(char **contents, long *length) +int PDC_getclipboard(char **contents, long *length) { #if !defined(EMXVIDEO) HMQ hmq; @@ -133,7 +133,7 @@ int PDC_CDECL PDC_getclipboard(char **contents, long *length) **man-end**********************************************************************/ -int PDC_CDECL PDC_setclipboard(char *contents, long length) +int PDC_setclipboard(char *contents, long length) { #if !defined(EMXVIDEO) HAB hab; @@ -203,7 +203,7 @@ int PDC_CDECL PDC_setclipboard(char *contents, long length) **man-end**********************************************************************/ -int PDC_CDECL PDC_freeclipboard(char *contents) +int PDC_freeclipboard(char *contents) { PDC_LOG(("PDC_freeclipboard() - called\n")); @@ -230,7 +230,7 @@ int PDC_CDECL PDC_freeclipboard(char *contents) **man-end**********************************************************************/ -int PDC_CDECL PDC_clearclipboard(void) +int PDC_clearclipboard(void) { #if !defined(EMXVIDEO) HAB hab; diff --git a/pdcurses/addch.c b/pdcurses/addch.c index 8caf86c8..533786a1 100644 --- a/pdcurses/addch.c +++ b/pdcurses/addch.c @@ -37,7 +37,7 @@ #ifdef PDCDEBUG const char *rcsid_addch = - "$Id: addch.c,v 1.14 2006/02/07 14:12:42 wmcbrine Exp $"; + "$Id: addch.c,v 1.15 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -130,21 +130,21 @@ const char *rcsid_addch = **man-end**********************************************************************/ -int PDC_CDECL addch(const chtype ch) +int addch(const chtype ch) { PDC_LOG(("addch() - called: ch=%x\n", ch)); return waddch(stdscr, ch); } -int PDC_CDECL waddch(WINDOW *win, const chtype ch) +int waddch(WINDOW *win, const chtype ch) { PDC_LOG(("waddch() - called: win=%x ch=%x\n", win, ch)); return PDC_chadd(win, ch, (bool)(!(SP->raw_out)), TRUE); } -int PDC_CDECL mvaddch(int y, int x, const chtype ch) +int mvaddch(int y, int x, const chtype ch) { PDC_LOG(("mvaddch() - called: y=%d x=%d ch=%x\n", y, x, ch)); @@ -154,7 +154,7 @@ int PDC_CDECL mvaddch(int y, int x, const chtype ch) return waddch(stdscr, ch); } -int PDC_CDECL mvwaddch(WINDOW *win, int y, int x, const chtype ch) +int mvwaddch(WINDOW *win, int y, int x, const chtype ch) { PDC_LOG(("mvwaddch() - called: win=%x y=%d x=%d ch=%d\n", win, y, x, ch)); @@ -165,14 +165,14 @@ int PDC_CDECL mvwaddch(WINDOW *win, int y, int x, const chtype ch) return waddch(win, ch); } -int PDC_CDECL echochar(const chtype ch) +int echochar(const chtype ch) { PDC_LOG(("echochar() - called: ch=%x\n", ch)); return wechochar(stdscr, ch); } -int PDC_CDECL wechochar(WINDOW *win, const chtype ch) +int wechochar(WINDOW *win, const chtype ch) { PDC_LOG(("wechochar() - called: win=%x ch=%x\n", win, ch)); diff --git a/pdcurses/addchstr.c b/pdcurses/addchstr.c index 01175b10..8ec297c0 100644 --- a/pdcurses/addchstr.c +++ b/pdcurses/addchstr.c @@ -38,7 +38,7 @@ #ifdef PDCDEBUG const char *rcsid_addchstr = - "$Id: addchstr.c,v 1.19 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: addchstr.c,v 1.20 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -88,28 +88,28 @@ const char *rcsid_addchstr = **man-end**********************************************************************/ -int PDC_CDECL addchstr(const chtype *ch) +int addchstr(const chtype *ch) { PDC_LOG(("addchstr() - called\n")); return waddchnstr(stdscr, ch, -1); } -int PDC_CDECL addchnstr(const chtype *ch, int n) +int addchnstr(const chtype *ch, int n) { PDC_LOG(("addchnstr() - called\n")); return waddchnstr(stdscr, ch, n); } -int PDC_CDECL waddchstr(WINDOW *win, const chtype *ch) +int waddchstr(WINDOW *win, const chtype *ch) { PDC_LOG(("waddchstr() - called: win=%x\n", win)); return waddchnstr(win, ch, -1); } -int PDC_CDECL waddchnstr(WINDOW *win, const chtype *ch, int n) +int waddchnstr(WINDOW *win, const chtype *ch, int n) { int y, x, maxx, minx; chtype *ptr; @@ -157,7 +157,7 @@ int PDC_CDECL waddchnstr(WINDOW *win, const chtype *ch, int n) return OK; } -int PDC_CDECL mvaddchstr(int y, int x, const chtype *ch) +int mvaddchstr(int y, int x, const chtype *ch) { PDC_LOG(("mvaddchstr() - called: y %d x %d\n", y, x)); @@ -167,7 +167,7 @@ int PDC_CDECL mvaddchstr(int y, int x, const chtype *ch) return waddchnstr(stdscr, ch, -1); } -int PDC_CDECL mvaddchnstr(int y, int x, const chtype *ch, int n) +int mvaddchnstr(int y, int x, const chtype *ch, int n) { PDC_LOG(("mvaddchnstr() - called: y %d x %d n %d\n", y, x, n)); @@ -177,7 +177,7 @@ int PDC_CDECL mvaddchnstr(int y, int x, const chtype *ch, int n) return waddchnstr(stdscr, ch, n); } -int PDC_CDECL mvwaddchstr(WINDOW *win, int y, int x, const chtype *ch) +int mvwaddchstr(WINDOW *win, int y, int x, const chtype *ch) { PDC_LOG(("waddchstr() - called:\n")); @@ -187,7 +187,7 @@ int PDC_CDECL mvwaddchstr(WINDOW *win, int y, int x, const chtype *ch) return waddchnstr(win, ch, -1); } -int PDC_CDECL mvwaddchnstr(WINDOW *win, int y, int x, +int mvwaddchnstr(WINDOW *win, int y, int x, const chtype *ch, int n) { PDC_LOG(("mvwaddchnstr() - called: y %d x %d n %d \n", y, x, n)); diff --git a/pdcurses/addstr.c b/pdcurses/addstr.c index 03360a3c..c18992a0 100644 --- a/pdcurses/addstr.c +++ b/pdcurses/addstr.c @@ -39,7 +39,7 @@ #ifdef PDCDEBUG const char *rcsid_addstr = - "$Id: addstr.c,v 1.14 2006/02/07 14:12:42 wmcbrine Exp $"; + "$Id: addstr.c,v 1.15 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -94,28 +94,28 @@ const char *rcsid_addstr = **man-end**********************************************************************/ -int PDC_CDECL addstr(const char *str) +int addstr(const char *str) { PDC_LOG(("addstr() - called: string=\"%s\"\n", str)); return waddnstr(stdscr, str, -1); } -int PDC_CDECL addnstr(const char *str, int n) +int addnstr(const char *str, int n) { PDC_LOG(("addnstr() - called: string=\"%s\" n %d \n", str, n)); return waddnstr(stdscr, str, n); } -int PDC_CDECL waddstr(WINDOW *win, const char *str) +int waddstr(WINDOW *win, const char *str) { PDC_LOG(("waddstr() - called: string=\"%s\"\n", str)); return waddnstr(win, str, -1); } -int PDC_CDECL waddnstr(WINDOW *win, const char *str, int n) +int waddnstr(WINDOW *win, const char *str, int n) { int i, ic; @@ -137,7 +137,7 @@ int PDC_CDECL waddnstr(WINDOW *win, const char *str, int n) return OK; } -int PDC_CDECL mvaddstr(int y, int x, const char *str) +int mvaddstr(int y, int x, const char *str) { PDC_LOG(("mvaddstr() - called: y %d x %d string=\"%s\"\n", y, x, str)); @@ -147,7 +147,7 @@ int PDC_CDECL mvaddstr(int y, int x, const char *str) return waddnstr(stdscr, str, -1); } -int PDC_CDECL mvaddnstr(int y, int x, const char *str, int n) +int mvaddnstr(int y, int x, const char *str, int n) { PDC_LOG(("mvaddnstr() - called: y %d x %d string=\"%s\" n %d \n", y, x, str, n)); @@ -158,7 +158,7 @@ int PDC_CDECL mvaddnstr(int y, int x, const char *str, int n) return waddnstr(stdscr, str, n); } -int PDC_CDECL mvwaddstr(WINDOW *win, int y, int x, const char *str) +int mvwaddstr(WINDOW *win, int y, int x, const char *str) { PDC_LOG(("mvwaddstr() - called: string=\"%s\"\n", str)); @@ -168,7 +168,7 @@ int PDC_CDECL mvwaddstr(WINDOW *win, int y, int x, const char *str) return waddnstr(win, str, -1); } -int PDC_CDECL mvwaddnstr(WINDOW *win, int y, int x, +int mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n) { PDC_LOG(("mvwaddnstr() - called: y %d x %d string=\"%s\" n %d \n", diff --git a/pdcurses/attr.c b/pdcurses/attr.c index 52bf533c..0f1c80d2 100644 --- a/pdcurses/attr.c +++ b/pdcurses/attr.c @@ -36,7 +36,7 @@ #ifdef PDCDEBUG const char *rcsid_attr = - "$Id: attr.c,v 1.16 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: attr.c,v 1.17 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -113,14 +113,14 @@ const char *rcsid_attr = **man-end**********************************************************************/ -int PDC_CDECL attroff(chtype attrs) +int attroff(chtype attrs) { PDC_LOG(("attroff() - called\n")); return wattroff(stdscr, attrs); } -int PDC_CDECL wattroff(WINDOW *win, chtype attrs) +int wattroff(WINDOW *win, chtype attrs) { PDC_LOG(("wattroff() - called\n")); @@ -132,14 +132,14 @@ int PDC_CDECL wattroff(WINDOW *win, chtype attrs) return OK; } -int PDC_CDECL attron(chtype attrs) +int attron(chtype attrs) { PDC_LOG(("attron() - called\n")); return wattron(stdscr, attrs); } -int PDC_CDECL wattron(WINDOW *win, chtype attrs) +int wattron(WINDOW *win, chtype attrs) { chtype newcolr, oldcolr; chtype newattr, oldattr; @@ -164,14 +164,14 @@ int PDC_CDECL wattron(WINDOW *win, chtype attrs) return OK; } -int PDC_CDECL attrset(chtype attrs) +int attrset(chtype attrs) { PDC_LOG(("attrset() - called\n")); return wattrset(stdscr, attrs); } -int PDC_CDECL wattrset(WINDOW *win, chtype attrs) +int wattrset(WINDOW *win, chtype attrs) { PDC_LOG(("wattrset() - called\n")); @@ -183,47 +183,47 @@ int PDC_CDECL wattrset(WINDOW *win, chtype attrs) return OK; } -int PDC_CDECL standend(void) +int standend(void) { PDC_LOG(("standend() - called\n")); return wattrset(stdscr, A_NORMAL); } -int PDC_CDECL standout(void) +int standout(void) { PDC_LOG(("standout() - called\n")); return wattrset(stdscr, A_STANDOUT); } -int PDC_CDECL wstandend(WINDOW *win) +int wstandend(WINDOW *win) { PDC_LOG(("wstandend() - called\n")); return wattrset(win, A_NORMAL); } -int PDC_CDECL wstandout(WINDOW *win) +int wstandout(WINDOW *win) { PDC_LOG(("wstandout() - called\n")); return wattrset(win, A_STANDOUT); } -chtype PDC_CDECL getattrs(WINDOW *win) +chtype getattrs(WINDOW *win) { return win ? win->_attrs : 0; } -int PDC_CDECL color_set(short color_pair, void *opts) +int color_set(short color_pair, void *opts) { PDC_LOG(("color_set() - called\n")); return wcolor_set(stdscr, color_pair, opts); } -int PDC_CDECL wcolor_set(WINDOW *win, short color_pair, void *opts) +int wcolor_set(WINDOW *win, short color_pair, void *opts) { PDC_LOG(("wcolor_set() - called\n")); diff --git a/pdcurses/beep.c b/pdcurses/beep.c index 30a94bf0..0323ace2 100644 --- a/pdcurses/beep.c +++ b/pdcurses/beep.c @@ -30,7 +30,7 @@ #ifdef PDCDEBUG const char *rcsid_beep = - "$Id: beep.c,v 1.12 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: beep.c,v 1.13 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -63,7 +63,7 @@ const char *rcsid_beep = **man-end**********************************************************************/ -int PDC_CDECL beep(void) +int beep(void) { PDC_LOG(("beep() - called\n")); @@ -78,7 +78,7 @@ int PDC_CDECL beep(void) return OK; } -int PDC_CDECL flash(void) +int flash(void) { PDC_LOG(("flash() - called\n")); diff --git a/pdcurses/bkgd.c b/pdcurses/bkgd.c index 1addf3ba..17cd8ef0 100644 --- a/pdcurses/bkgd.c +++ b/pdcurses/bkgd.c @@ -28,7 +28,7 @@ #ifdef PDCDEBUG const char *rcsid_bkgd = - "$Id: bkgd.c,v 1.13 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: bkgd.c,v 1.14 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -90,28 +90,28 @@ const char *rcsid_bkgd = **man-end**********************************************************************/ -int PDC_CDECL bkgd(chtype ch) +int bkgd(chtype ch) { PDC_LOG(("bkgd() - called\n")); return wbkgd(stdscr, ch); } -void PDC_CDECL bkgdset(chtype ch) +void bkgdset(chtype ch) { PDC_LOG(("bkgdset() - called\n")); wbkgdset(stdscr, ch); } -chtype PDC_CDECL getbkgd(WINDOW *win) +chtype getbkgd(WINDOW *win) { PDC_LOG(("getbkgd() - called\n")); return win ? win->_bkgd : (chtype)ERR; } -int PDC_CDECL wbkgd(WINDOW *win, chtype ch) +int wbkgd(WINDOW *win, chtype ch) { int x, y; chtype oldcolr, oldch, newcolr, newch, colr, attr; @@ -198,7 +198,7 @@ int PDC_CDECL wbkgd(WINDOW *win, chtype ch) return OK; } -void PDC_CDECL wbkgdset(WINDOW *win, chtype ch) +void wbkgdset(WINDOW *win, chtype ch) { chtype bkgdattr; diff --git a/pdcurses/border.c b/pdcurses/border.c index 07a814c6..c7cfc4cc 100644 --- a/pdcurses/border.c +++ b/pdcurses/border.c @@ -37,7 +37,7 @@ #ifdef PDCDEBUG const char *rcsid_border = - "$Id: border.c,v 1.16 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: border.c,v 1.17 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -154,7 +154,7 @@ static chtype PDC_attr_passthru(WINDOW *win, chtype ch) return ch; } -int PDC_CDECL wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, +int wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, chtype bl, chtype br) { int ymax, xmax; @@ -216,7 +216,7 @@ int PDC_CDECL wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, return OK; } -int PDC_CDECL border(chtype ls, chtype rs, chtype ts, chtype bs, +int border(chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, chtype bl, chtype br) { PDC_LOG(("border() - called\n")); @@ -224,7 +224,7 @@ int PDC_CDECL border(chtype ls, chtype rs, chtype ts, chtype bs, return wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br); } -int PDC_CDECL box(WINDOW *win, chtype verch, chtype horch) +int box(WINDOW *win, chtype verch, chtype horch) { PDC_LOG(("box() - called\n")); @@ -234,21 +234,21 @@ int PDC_CDECL box(WINDOW *win, chtype verch, chtype horch) return wborder(win, verch, verch, horch, horch, 0, 0, 0, 0); } -int PDC_CDECL hline(chtype ch, int n) +int hline(chtype ch, int n) { PDC_LOG(("hline() - called\n")); return whline(stdscr, ch, n); } -int PDC_CDECL vline(chtype ch, int n) +int vline(chtype ch, int n) { PDC_LOG(("vline() - called\n")); return wvline(stdscr, ch, n); } -int PDC_CDECL whline(WINDOW *win, chtype ch, int n) +int whline(WINDOW *win, chtype ch, int n) { int startpos, endpos; @@ -287,7 +287,7 @@ int PDC_CDECL whline(WINDOW *win, chtype ch, int n) return OK; } -int PDC_CDECL wvline(WINDOW *win, chtype ch, int n) +int wvline(WINDOW *win, chtype ch, int n) { int endpos; @@ -324,7 +324,7 @@ int PDC_CDECL wvline(WINDOW *win, chtype ch, int n) return OK; } -int PDC_CDECL mvhline(int y, int x, chtype ch, int n) +int mvhline(int y, int x, chtype ch, int n) { PDC_LOG(("mvhline() - called\n")); @@ -334,7 +334,7 @@ int PDC_CDECL mvhline(int y, int x, chtype ch, int n) return whline(stdscr, ch, n); } -int PDC_CDECL mvvline(int y, int x, chtype ch, int n) +int mvvline(int y, int x, chtype ch, int n) { PDC_LOG(("mvvline() - called\n")); @@ -344,7 +344,7 @@ int PDC_CDECL mvvline(int y, int x, chtype ch, int n) return wvline(stdscr, ch, n); } -int PDC_CDECL mvwhline(WINDOW *win, int y, int x, chtype ch, int n) +int mvwhline(WINDOW *win, int y, int x, chtype ch, int n) { PDC_LOG(("mvwhline() - called\n")); @@ -354,7 +354,7 @@ int PDC_CDECL mvwhline(WINDOW *win, int y, int x, chtype ch, int n) return whline(win, ch, n); } -int PDC_CDECL mvwvline(WINDOW *win, int y, int x, chtype ch, int n) +int mvwvline(WINDOW *win, int y, int x, chtype ch, int n) { PDC_LOG(("mvwvline() - called\n")); @@ -367,7 +367,7 @@ int PDC_CDECL mvwvline(WINDOW *win, int y, int x, chtype ch, int n) /* PDC_lineattr() -- add the specified attribute to a line of chtypes. Used only as the core routine for the next three functions. */ -static int PDC_CDECL PDC_lineattr(WINDOW *win, int n, bool state, chtype attr) +static int PDC_lineattr(WINDOW *win, int n, bool state, chtype attr) { int endpos; @@ -405,21 +405,21 @@ static int PDC_CDECL PDC_lineattr(WINDOW *win, int n, bool state, chtype attr) return OK; } -int PDC_CDECL PDC_wunderline(WINDOW *win, int n, bool state) +int PDC_wunderline(WINDOW *win, int n, bool state) { PDC_LOG(("PDC_wunderline() - called\n")); return PDC_lineattr(win, n, state, A_UNDERLINE); } -int PDC_CDECL PDC_wleftline(WINDOW *win, int n, bool state) +int PDC_wleftline(WINDOW *win, int n, bool state) { PDC_LOG(("PDC_wleftline() - called\n")); return PDC_lineattr(win, n, state, A_LEFTLINE); } -int PDC_CDECL PDC_wrightline(WINDOW *win, int n, bool state) +int PDC_wrightline(WINDOW *win, int n, bool state) { PDC_LOG(("PDC_wrightline() - called\n")); diff --git a/pdcurses/clear.c b/pdcurses/clear.c index 674c2cd1..80d325ec 100644 --- a/pdcurses/clear.c +++ b/pdcurses/clear.c @@ -31,7 +31,7 @@ #ifdef PDCDEBUG const char *rcsid_clear = - "$Id: clear.c,v 1.13 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: clear.c,v 1.14 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -95,7 +95,7 @@ const char *rcsid_clear = **man-end**********************************************************************/ -int PDC_CDECL clear(void) +int clear(void) { PDC_LOG(("clear() - called\n")); @@ -106,7 +106,7 @@ int PDC_CDECL clear(void) return erase(); } -int PDC_CDECL wclear(WINDOW *win) +int wclear(WINDOW *win) { PDC_LOG(("wclear() - called\n")); @@ -117,12 +117,12 @@ int PDC_CDECL wclear(WINDOW *win) return werase(win); } -int PDC_CDECL erase(void) +int erase(void) { return werase(stdscr); } -int PDC_CDECL werase(WINDOW *win) +int werase(WINDOW *win) { PDC_LOG(("werase() - called\n")); @@ -133,12 +133,12 @@ int PDC_CDECL werase(WINDOW *win) return wclrtobot(win); } -int PDC_CDECL clrtobot(void) +int clrtobot(void) { return wclrtobot(stdscr); } -int PDC_CDECL wclrtobot(WINDOW *win) +int wclrtobot(WINDOW *win) { int savey = win->_cury; int savex = win->_curx; @@ -165,12 +165,12 @@ int PDC_CDECL wclrtobot(WINDOW *win) return OK; } -int PDC_CDECL clrtoeol(void) +int clrtoeol(void) { return wclrtoeol(stdscr); } -int PDC_CDECL wclrtoeol(WINDOW *win) +int wclrtoeol(WINDOW *win) { int x, y, minx; chtype blank, *ptr; diff --git a/pdcurses/color.c b/pdcurses/color.c index d3df57aa..85cd614c 100644 --- a/pdcurses/color.c +++ b/pdcurses/color.c @@ -36,7 +36,7 @@ static void PDC_init_pair(short, short, short); #ifdef PDCDEBUG const char *rcsid_color = - "$Id: color.c,v 1.28 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: color.c,v 1.29 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -170,7 +170,7 @@ unsigned char atrtab[MAX_ATRTAB] = unsigned char colorset[PDC_COLOR_PAIRS]; -chtype PDC_CDECL COLOR_PAIR(int n) +chtype COLOR_PAIR(int n) { #ifdef CHTYPE_LONG return (chtype)n << 24; @@ -179,7 +179,7 @@ chtype PDC_CDECL COLOR_PAIR(int n) #endif } -int PDC_CDECL PAIR_NUMBER(chtype value) +int PAIR_NUMBER(chtype value) { #ifdef CHTYPE_LONG return (value & A_COLOR) >> 24; @@ -188,7 +188,7 @@ int PDC_CDECL PAIR_NUMBER(chtype value) #endif } -int PDC_CDECL start_color(void) +int start_color(void) { PDC_LOG(("start_color() - called\n")); @@ -207,7 +207,7 @@ int PDC_CDECL start_color(void) return OK; } -int PDC_CDECL init_pair(short colorpair, short foreground, short background) +int init_pair(short colorpair, short foreground, short background) { #if defined(CHTYPE_LONG) && !defined(XCURSES) # define USE_PDC_INIT @@ -252,21 +252,21 @@ int PDC_CDECL init_pair(short colorpair, short foreground, short background) return OK; } -bool PDC_CDECL has_colors(void) +bool has_colors(void) { PDC_LOG(("has_colors() - called\n")); return SP->mono ? FALSE : TRUE; } -int PDC_CDECL init_color(short color, short red, short green, short blue) +int init_color(short color, short red, short green, short blue) { PDC_LOG(("init_color() - called\n")); return ERR; } -int PDC_CDECL color_content(short color, short *red, short *green, short *blue) +int color_content(short color, short *red, short *green, short *blue) { PDC_LOG(("color_content() - called\n")); @@ -284,14 +284,14 @@ int PDC_CDECL color_content(short color, short *red, short *green, short *blue) return OK; } -bool PDC_CDECL can_change_color(void) +bool can_change_color(void) { PDC_LOG(("can_change_color() - called\n")); return FALSE; } -int PDC_CDECL pair_content(short colorpair, short *foreground, +int pair_content(short colorpair, short *foreground, short *background) { PDC_LOG(("pair_content() - called\n")); @@ -306,7 +306,7 @@ int PDC_CDECL pair_content(short colorpair, short *foreground, return OK; } -int PDC_CDECL PDC_set_line_color(short color) +int PDC_set_line_color(short color) { if (color >= COLORS || color < 0) return ERR; diff --git a/pdcurses/delch.c b/pdcurses/delch.c index e0bfa331..372a4243 100644 --- a/pdcurses/delch.c +++ b/pdcurses/delch.c @@ -34,7 +34,7 @@ #ifdef PDCDEBUG const char *rcsid_delch = - "$Id: delch.c,v 1.12 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: delch.c,v 1.13 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -79,14 +79,14 @@ const char *rcsid_delch = **man-end**********************************************************************/ -int PDC_CDECL delch(void) +int delch(void) { PDC_LOG(("delch() - called\n")); return wdelch(stdscr); } -int PDC_CDECL wdelch(WINDOW *win) +int wdelch(WINDOW *win) { int y, x, maxx; chtype *temp1; @@ -120,7 +120,7 @@ int PDC_CDECL wdelch(WINDOW *win) return OK; } -int PDC_CDECL mvdelch(int y, int x) +int mvdelch(int y, int x) { PDC_LOG(("mvdelch() - called\n")); @@ -130,7 +130,7 @@ int PDC_CDECL mvdelch(int y, int x) return wdelch(stdscr); } -int PDC_CDECL mvwdelch(WINDOW *win, int y, int x) +int mvwdelch(WINDOW *win, int y, int x) { PDC_LOG(("mvwdelch() - called\n")); diff --git a/pdcurses/deleteln.c b/pdcurses/deleteln.c index aab7e194..7e1eb638 100644 --- a/pdcurses/deleteln.c +++ b/pdcurses/deleteln.c @@ -30,7 +30,7 @@ #ifdef PDCDEBUG const char *rcsid_deleteln = - "$Id: deleteln.c,v 1.12 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: deleteln.c,v 1.13 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -82,14 +82,14 @@ const char *rcsid_deleteln = **man-end**********************************************************************/ -int PDC_CDECL deleteln(void) +int deleteln(void) { PDC_LOG(("deleteln() - called\n")); return wdeleteln(stdscr); } -int PDC_CDECL wdeleteln(WINDOW *win) +int wdeleteln(WINDOW *win) { chtype blank, *temp, *ptr; int y; @@ -128,14 +128,14 @@ int PDC_CDECL wdeleteln(WINDOW *win) return OK; } -int PDC_CDECL insdelln(int n) +int insdelln(int n) { PDC_LOG(("insdelln() - called\n")); return winsdelln(stdscr, n); } -int PDC_CDECL winsdelln(WINDOW *win, int n) +int winsdelln(WINDOW *win, int n) { int i; @@ -161,7 +161,7 @@ int PDC_CDECL winsdelln(WINDOW *win, int n) return OK; } -int PDC_CDECL winsertln(WINDOW *win) +int winsertln(WINDOW *win) { chtype blank, *temp, *end; int y; @@ -197,14 +197,14 @@ int PDC_CDECL winsertln(WINDOW *win) return OK; } -int PDC_CDECL insertln(void) +int insertln(void) { PDC_LOG(("insertln() - called\n")); return winsertln(stdscr); } -int PDC_CDECL mvwinsertln(WINDOW *win, int y, int x) +int mvwinsertln(WINDOW *win, int y, int x) { PDC_LOG(("mvwinsertln() - called\n")); diff --git a/pdcurses/getch.c b/pdcurses/getch.c index 943b94b1..37286d93 100644 --- a/pdcurses/getch.c +++ b/pdcurses/getch.c @@ -36,7 +36,7 @@ #ifdef PDCDEBUG const char *rcsid_getch = - "$Id: getch.c,v 1.22 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: getch.c,v 1.23 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -111,14 +111,14 @@ const char *rcsid_getch = #define getch PDC_getch #define ungetch PDC_ungetch -int PDC_CDECL PDC_getch(void) +int PDC_getch(void) { PDC_LOG(("getch() - called\n")); return wgetch(stdscr); } -int PDC_CDECL wgetch(WINDOW *win) +int wgetch(WINDOW *win) { extern int c_pindex; /* putter index */ extern int c_gindex; /* getter index */ @@ -251,7 +251,7 @@ int PDC_CDECL wgetch(WINDOW *win) } } -int PDC_CDECL mvgetch(int y, int x) +int mvgetch(int y, int x) { PDC_LOG(("mvgetch() - called\n")); @@ -261,7 +261,7 @@ int PDC_CDECL mvgetch(int y, int x) return wgetch(stdscr); } -int PDC_CDECL mvwgetch(WINDOW *win, int y, int x) +int mvwgetch(WINDOW *win, int y, int x) { PDC_LOG(("mvwgetch() - called\n")); @@ -271,7 +271,7 @@ int PDC_CDECL mvwgetch(WINDOW *win, int y, int x) return wgetch(win); } -int PDC_CDECL PDC_ungetch(int ch) +int PDC_ungetch(int ch) { extern int c_ungind; /* ungetch() push index */ extern int c_ungch[NUNGETCH]; /* array of ungotten chars */ diff --git a/pdcurses/getstr.c b/pdcurses/getstr.c index 7c75f0f3..087011d4 100644 --- a/pdcurses/getstr.c +++ b/pdcurses/getstr.c @@ -41,7 +41,7 @@ #ifdef PDCDEBUG const char *rcsid_getstr = - "$Id: getstr.c,v 1.20 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: getstr.c,v 1.21 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -100,21 +100,21 @@ const char *rcsid_getstr = #define MAXLINE 255 -int PDC_CDECL getstr(char *str) +int getstr(char *str) { PDC_LOG(("getstr() - called\n")); return wgetnstr(stdscr, str, MAXLINE); } -int PDC_CDECL wgetstr(WINDOW *win, char *str) +int wgetstr(WINDOW *win, char *str) { PDC_LOG(("wgetstr() - called\n")); return wgetnstr(win, str, MAXLINE); } -int PDC_CDECL mvgetstr(int y, int x, char *str) +int mvgetstr(int y, int x, char *str) { PDC_LOG(("mvgetstr() - called\n")); @@ -124,7 +124,7 @@ int PDC_CDECL mvgetstr(int y, int x, char *str) return wgetnstr(stdscr, str, MAXLINE); } -int PDC_CDECL mvwgetstr(WINDOW *win, int y, int x, char *str) +int mvwgetstr(WINDOW *win, int y, int x, char *str) { PDC_LOG(("mvwgetstr() - called\n")); @@ -134,14 +134,14 @@ int PDC_CDECL mvwgetstr(WINDOW *win, int y, int x, char *str) return wgetnstr(win, str, MAXLINE); } -int PDC_CDECL getnstr(char *str, int n) +int getnstr(char *str, int n) { PDC_LOG(("getnstr() - called\n")); return wgetnstr(stdscr, str, n); } -int PDC_CDECL wgetnstr(WINDOW *win, char *str, int n) +int wgetnstr(WINDOW *win, char *str, int n) { int ch, i, num, t, x, chars; char *p; @@ -282,7 +282,7 @@ int PDC_CDECL wgetnstr(WINDOW *win, char *str, int n) return OK; } -int PDC_CDECL mvgetnstr(int y, int x, char *str, int n) +int mvgetnstr(int y, int x, char *str, int n) { PDC_LOG(("mvgetnstr() - called\n")); @@ -292,7 +292,7 @@ int PDC_CDECL mvgetnstr(int y, int x, char *str, int n) return wgetnstr(stdscr, str, n); } -int PDC_CDECL mvwgetnstr(WINDOW *win, int y, int x, char *str, int n) +int mvwgetnstr(WINDOW *win, int y, int x, char *str, int n) { PDC_LOG(("mvwgetnstr() - called\n")); diff --git a/pdcurses/getyx.c b/pdcurses/getyx.c index 5b9eacab..f6993ea8 100644 --- a/pdcurses/getyx.c +++ b/pdcurses/getyx.c @@ -29,7 +29,7 @@ #ifdef PDCDEBUG const char *rcsid_getyx = - "$Id: getyx.c,v 1.10 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: getyx.c,v 1.11 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -84,7 +84,7 @@ const char *rcsid_getyx = **man-end**********************************************************************/ -int PDC_CDECL getbegy(WINDOW *win) +int getbegy(WINDOW *win) { PDC_LOG(("getbegy() - called\n")); @@ -94,7 +94,7 @@ int PDC_CDECL getbegy(WINDOW *win) return win->_begy; } -int PDC_CDECL getbegx(WINDOW *win) +int getbegx(WINDOW *win) { PDC_LOG(("getbegx() - called\n")); @@ -104,7 +104,7 @@ int PDC_CDECL getbegx(WINDOW *win) return win->_begx; } -int PDC_CDECL getpary(WINDOW *win) +int getpary(WINDOW *win) { PDC_LOG(("getpary() - called\n")); @@ -114,7 +114,7 @@ int PDC_CDECL getpary(WINDOW *win) return win->_pary; } -int PDC_CDECL getparx(WINDOW *win) +int getparx(WINDOW *win) { PDC_LOG(("getparx() - called\n")); @@ -124,7 +124,7 @@ int PDC_CDECL getparx(WINDOW *win) return win->_parx; } -int PDC_CDECL getmaxy(WINDOW *win) +int getmaxy(WINDOW *win) { PDC_LOG(("getmaxy() - called\n")); @@ -134,7 +134,7 @@ int PDC_CDECL getmaxy(WINDOW *win) return win->_maxy; } -int PDC_CDECL getmaxx(WINDOW *win) +int getmaxx(WINDOW *win) { PDC_LOG(("getmaxx() - called\n")); diff --git a/pdcurses/inch.c b/pdcurses/inch.c index b70bc003..78ca405a 100644 --- a/pdcurses/inch.c +++ b/pdcurses/inch.c @@ -33,7 +33,7 @@ #ifdef PDCDEBUG const char *rcsid_inch = - "$Id: inch.c,v 1.11 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: inch.c,v 1.12 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -69,7 +69,7 @@ const char *rcsid_inch = **man-end**********************************************************************/ -chtype PDC_CDECL winch(WINDOW *win) +chtype winch(WINDOW *win) { PDC_LOG(("winch() - called\n")); @@ -79,14 +79,14 @@ chtype PDC_CDECL winch(WINDOW *win) return win->_y[win->_cury][win->_curx]; } -chtype PDC_CDECL inch(void) +chtype inch(void) { PDC_LOG(("inch() - called\n")); return winch(stdscr); } -chtype PDC_CDECL mvinch(int y, int x) +chtype mvinch(int y, int x) { PDC_LOG(("mvinch() - called\n")); @@ -96,7 +96,7 @@ chtype PDC_CDECL mvinch(int y, int x) return stdscr->_y[stdscr->_cury][stdscr->_curx]; } -chtype PDC_CDECL mvwinch(WINDOW *win, int y, int x) +chtype mvwinch(WINDOW *win, int y, int x) { PDC_LOG(("mvwinch() - called\n")); diff --git a/pdcurses/inchstr.c b/pdcurses/inchstr.c index b7ef2ec1..66584480 100644 --- a/pdcurses/inchstr.c +++ b/pdcurses/inchstr.c @@ -37,7 +37,7 @@ #ifdef PDCDEBUG const char *rcsid_inchstr = - "$Id: inchstr.c,v 1.11 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: inchstr.c,v 1.12 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -84,28 +84,28 @@ const char *rcsid_inchstr = **man-end**********************************************************************/ -int PDC_CDECL inchstr(chtype *ch) +int inchstr(chtype *ch) { PDC_LOG(("inchstr() - called\n")); return winchnstr(stdscr, ch, stdscr->_maxx - stdscr->_curx); } -int PDC_CDECL inchnstr(chtype *ch, int n) +int inchnstr(chtype *ch, int n) { PDC_LOG(("inchnstr() - called\n")); return winchnstr(stdscr, ch, n); } -int PDC_CDECL winchstr(WINDOW *win, chtype *ch) +int winchstr(WINDOW *win, chtype *ch) { PDC_LOG(("winchstr() - called\n")); return winchnstr(win, ch, win->_maxx - win->_curx); } -int PDC_CDECL winchnstr(WINDOW *win, chtype *ch, int n) +int winchnstr(WINDOW *win, chtype *ch, int n) { int i; chtype *ptr; @@ -128,7 +128,7 @@ int PDC_CDECL winchnstr(WINDOW *win, chtype *ch, int n) return i; } -int PDC_CDECL mvinchstr(int y, int x, chtype *ch) +int mvinchstr(int y, int x, chtype *ch) { PDC_LOG(("mvinchstr() - called: y %d x %d\n", y, x)); @@ -138,7 +138,7 @@ int PDC_CDECL mvinchstr(int y, int x, chtype *ch) return winchnstr(stdscr, ch, stdscr->_maxx - stdscr->_curx); } -int PDC_CDECL mvinchnstr(int y, int x, chtype *ch, int n) +int mvinchnstr(int y, int x, chtype *ch, int n) { PDC_LOG(("mvinchnstr() - called: y %d x %d n %d\n", y, x, n)); @@ -148,7 +148,7 @@ int PDC_CDECL mvinchnstr(int y, int x, chtype *ch, int n) return winchnstr(stdscr, ch, n); } -int PDC_CDECL mvwinchstr(WINDOW *win, int y, int x, chtype *ch) +int mvwinchstr(WINDOW *win, int y, int x, chtype *ch) { PDC_LOG(("winchstr() - called:\n")); @@ -158,7 +158,7 @@ int PDC_CDECL mvwinchstr(WINDOW *win, int y, int x, chtype *ch) return winchnstr(win, ch, win->_maxx - win->_curx); } -int PDC_CDECL mvwinchnstr(WINDOW *win, int y, int x, chtype *ch, int n) +int mvwinchnstr(WINDOW *win, int y, int x, chtype *ch, int n) { PDC_LOG(("mvwinchnstr() - called: y %d x %d n %d \n", y, x, n)); diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index e12fb512..7399e032 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -44,7 +44,7 @@ #ifdef PDCDEBUG const char *rcsid_initscr = - "$Id: initscr.c,v 1.29 2006/01/30 12:17:17 wmcbrine Exp $"; + "$Id: initscr.c,v 1.30 2006/02/08 17:40:33 wmcbrine Exp $"; #endif const char *_curses_notice = "PDCurses 2.7b - Public Domain 2006"; @@ -191,7 +191,7 @@ extern void (*PDC_initial_slk)(void); **man-end**********************************************************************/ -WINDOW * PDC_CDECL Xinitscr(int argc, char *argv[]) +WINDOW * Xinitscr(int argc, char *argv[]) { int i; @@ -325,14 +325,14 @@ WINDOW * PDC_CDECL Xinitscr(int argc, char *argv[]) return stdscr; } -WINDOW * PDC_CDECL initscr(void) +WINDOW * initscr(void) { PDC_LOG(("initscr() - called\n")); return Xinitscr(0, NULL); } -int PDC_CDECL endwin(void) +int endwin(void) { PDC_LOG(("endwin() - called\n")); @@ -371,21 +371,21 @@ int PDC_CDECL endwin(void) return OK; } -bool PDC_CDECL isendwin(void) +bool isendwin(void) { PDC_LOG(("isendwin() - called\n")); return SP->alive ? FALSE : TRUE; } -SCREEN * PDC_CDECL newterm(char *type, FILE *outfd, FILE *infd) +SCREEN * newterm(char *type, FILE *outfd, FILE *infd) { PDC_LOG(("newterm() - called\n")); return NULL; } -SCREEN * PDC_CDECL set_term(SCREEN *new) +SCREEN * set_term(SCREEN *new) { PDC_LOG(("set_term() - called\n")); @@ -394,7 +394,7 @@ SCREEN * PDC_CDECL set_term(SCREEN *new) return SP; } -void PDC_CDECL delscreen(SCREEN *sp) +void delscreen(SCREEN *sp) { PDC_LOG(("delscreen() - called\n")); @@ -416,7 +416,7 @@ void PDC_CDECL delscreen(SCREEN *sp) #endif } -int PDC_CDECL resize_term(int nlines, int ncols) +int resize_term(int nlines, int ncols) { PDC_LOG(("resize_term() - called: nlines %d\n", nlines)); @@ -462,7 +462,7 @@ int PDC_CDECL resize_term(int nlines, int ncols) return OK; } -bool PDC_CDECL is_termresized(void) +bool is_termresized(void) { PDC_LOG(("is_termresized() - called\n")); diff --git a/pdcurses/inopts.c b/pdcurses/inopts.c index cb8d9448..dbaa03b8 100644 --- a/pdcurses/inopts.c +++ b/pdcurses/inopts.c @@ -48,7 +48,7 @@ #ifdef PDCDEBUG const char *rcsid_inopts = - "$Id: inopts.c,v 1.19 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: inopts.c,v 1.20 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -201,7 +201,7 @@ const char *rcsid_inopts = **man-end**********************************************************************/ -int PDC_CDECL cbreak(void) +int cbreak(void) { PDC_LOG(("cbreak() - called\n")); @@ -210,7 +210,7 @@ int PDC_CDECL cbreak(void) return OK; } -int PDC_CDECL nocbreak(void) +int nocbreak(void) { PDC_LOG(("nocbreak() - called\n")); @@ -220,7 +220,7 @@ int PDC_CDECL nocbreak(void) return OK; } -int PDC_CDECL echo(void) +int echo(void) { PDC_LOG(("echo() - called\n")); @@ -229,7 +229,7 @@ int PDC_CDECL echo(void) return OK; } -int PDC_CDECL noecho(void) +int noecho(void) { PDC_LOG(("noecho() - called\n")); @@ -238,7 +238,7 @@ int PDC_CDECL noecho(void) return OK; } -int PDC_CDECL halfdelay(int tenths) +int halfdelay(int tenths) { PDC_LOG(("halfdelay() - called\n")); @@ -250,14 +250,14 @@ int PDC_CDECL halfdelay(int tenths) return OK; } -int PDC_CDECL intrflush(WINDOW *win, bool bf) +int intrflush(WINDOW *win, bool bf) { PDC_LOG(("intrflush() - called\n")); return OK; } -int PDC_CDECL keypad(WINDOW *win, bool bf) +int keypad(WINDOW *win, bool bf) { PDC_LOG(("keypad() - called\n")); @@ -269,7 +269,7 @@ int PDC_CDECL keypad(WINDOW *win, bool bf) return OK; } -int PDC_CDECL meta(WINDOW *win, bool bf) +int meta(WINDOW *win, bool bf) { PDC_LOG(("meta() - called\n")); @@ -278,7 +278,7 @@ int PDC_CDECL meta(WINDOW *win, bool bf) return OK; } -int PDC_CDECL nl(void) +int nl(void) { PDC_LOG(("nl() - called\n")); @@ -287,7 +287,7 @@ int PDC_CDECL nl(void) return OK; } -int PDC_CDECL nonl(void) +int nonl(void) { PDC_LOG(("nonl() - called\n")); @@ -296,7 +296,7 @@ int PDC_CDECL nonl(void) return OK; } -int PDC_CDECL nodelay(WINDOW *win, bool flag) +int nodelay(WINDOW *win, bool flag) { PDC_LOG(("nodelay() - called\n")); @@ -308,14 +308,14 @@ int PDC_CDECL nodelay(WINDOW *win, bool flag) return OK; } -int PDC_CDECL notimeout(WINDOW *win, bool flag) +int notimeout(WINDOW *win, bool flag) { PDC_LOG(("notimeout() - called\n")); return OK; } -int PDC_CDECL raw(void) +int raw(void) { #ifdef OS2 # ifndef EMXVIDEO @@ -341,7 +341,7 @@ int PDC_CDECL raw(void) return OK; } -int PDC_CDECL noraw(void) +int noraw(void) { #ifdef OS2 # ifndef EMXVIDEO @@ -366,17 +366,17 @@ int PDC_CDECL noraw(void) return OK; } -void PDC_CDECL noqiflush(void) +void noqiflush(void) { PDC_LOG(("noqiflush() - called\n")); } -void PDC_CDECL qiflush(void) +void qiflush(void) { PDC_LOG(("qiflush() - called\n")); } -int PDC_CDECL typeahead(int fildes) +int typeahead(int fildes) { PDC_LOG(("typeahead() - called\n")); @@ -385,7 +385,7 @@ int PDC_CDECL typeahead(int fildes) return OK; } -void PDC_CDECL wtimeout(WINDOW *win, int delay) +void wtimeout(WINDOW *win, int delay) { PDC_LOG(("wtimeout() - called\n")); @@ -419,7 +419,7 @@ void PDC_CDECL wtimeout(WINDOW *win, int delay) } } -void PDC_CDECL timeout(int delay) +void timeout(int delay) { PDC_LOG(("timeout() - called\n")); diff --git a/pdcurses/insch.c b/pdcurses/insch.c index 7e14c381..7ba2c010 100644 --- a/pdcurses/insch.c +++ b/pdcurses/insch.c @@ -35,7 +35,7 @@ #ifdef PDCDEBUG const char *rcsid_insch = - "$Id: insch.c,v 1.12 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: insch.c,v 1.13 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -124,21 +124,21 @@ const char *rcsid_insch = **man-end**********************************************************************/ -int PDC_CDECL insch(chtype ch) +int insch(chtype ch) { PDC_LOG(("insch() - called\n")); return PDC_chins(stdscr, ch, (bool)(!(SP->raw_out))); } -int PDC_CDECL winsch(WINDOW *win, chtype ch) +int winsch(WINDOW *win, chtype ch) { PDC_LOG(("winsch() - called\n")); return PDC_chins(win, ch, (bool)(!(SP->raw_out))); } -int PDC_CDECL mvinsch(int y, int x, chtype ch) +int mvinsch(int y, int x, chtype ch) { PDC_LOG(("mvinsch() - called\n")); @@ -148,7 +148,7 @@ int PDC_CDECL mvinsch(int y, int x, chtype ch) return PDC_chins(stdscr, ch, (bool)(!(SP->raw_out))); } -int PDC_CDECL mvwinsch(WINDOW *win, int y, int x, chtype ch) +int mvwinsch(WINDOW *win, int y, int x, chtype ch) { PDC_LOG(("mvwinsch() - called\n")); diff --git a/pdcurses/insstr.c b/pdcurses/insstr.c index 819d6bf5..cc8e56c1 100644 --- a/pdcurses/insstr.c +++ b/pdcurses/insstr.c @@ -40,7 +40,7 @@ #ifdef PDCDEBUG const char *rcsid_insstr = - "$Id: insstr.c,v 1.16 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: insstr.c,v 1.17 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -97,28 +97,28 @@ const char *rcsid_insstr = **man-end**********************************************************************/ -int PDC_CDECL insstr(const char *str) +int insstr(const char *str) { PDC_LOG(("insstr() - called: string=\"%s\"\n", str)); return winsnstr(stdscr, str, -1); } -int PDC_CDECL insnstr(const char *str, int n) +int insnstr(const char *str, int n) { PDC_LOG(("insnstr() - called: string=\"%s\" n %d \n", str, n)); return winsnstr(stdscr, str, n); } -int PDC_CDECL winsstr(WINDOW *win, const char *str) +int winsstr(WINDOW *win, const char *str) { PDC_LOG(("winsstr() - called: string=\"%s\"\n", str)); return winsnstr(win, str, -1); } -int PDC_CDECL winsnstr(WINDOW *win, const char *str, int n) +int winsnstr(WINDOW *win, const char *str, int n) { int ic; @@ -141,7 +141,7 @@ int PDC_CDECL winsnstr(WINDOW *win, const char *str, int n) return OK; } -int PDC_CDECL mvinsstr(int y, int x, const char *str) +int mvinsstr(int y, int x, const char *str) { PDC_LOG(("mvinsstr() - called: y %d x %d string=\"%s\"\n", y, x, str)); @@ -152,7 +152,7 @@ int PDC_CDECL mvinsstr(int y, int x, const char *str) return winsnstr(stdscr, str, -1); } -int PDC_CDECL mvinsnstr(int y, int x, const char *str, int n) +int mvinsnstr(int y, int x, const char *str, int n) { PDC_LOG(("mvinsnstr() - called: y %d x %d string=\"%s\" n %d \n", y, x, str, n)); @@ -163,7 +163,7 @@ int PDC_CDECL mvinsnstr(int y, int x, const char *str, int n) return winsnstr(stdscr, str, n); } -int PDC_CDECL mvwinsstr(WINDOW *win, int y, int x, const char *str) +int mvwinsstr(WINDOW *win, int y, int x, const char *str) { PDC_LOG(("mvwinsstr() - called: string=\"%s\"\n", str)); @@ -173,7 +173,7 @@ int PDC_CDECL mvwinsstr(WINDOW *win, int y, int x, const char *str) return winsnstr(win, str, -1); } -int PDC_CDECL mvwinsnstr(WINDOW *win,int y, int x, const char *str, int n) +int mvwinsnstr(WINDOW *win,int y, int x, const char *str, int n) { PDC_LOG(("mvwinsnstr() - called: y %d x %d string=\"%s\" n %d \n", y, x, str, n)); diff --git a/pdcurses/instr.c b/pdcurses/instr.c index e1dbc2c2..642c391f 100644 --- a/pdcurses/instr.c +++ b/pdcurses/instr.c @@ -40,7 +40,7 @@ #ifdef PDCDEBUG const char *rcsid_instr = - "$Id: instr.c,v 1.12 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: instr.c,v 1.13 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -86,28 +86,28 @@ const char *rcsid_instr = **man-end**********************************************************************/ -int PDC_CDECL instr(char *str) +int instr(char *str) { PDC_LOG(("instr() - called: string=\"%s\"\n", str)); return winnstr(stdscr, str, stdscr->_maxx); } -int PDC_CDECL innstr(char *str, int n) +int innstr(char *str, int n) { PDC_LOG(("innstr() - called: n %d \n", n)); return winnstr(stdscr, str, n); } -int PDC_CDECL winstr(WINDOW *win, char *str) +int winstr(WINDOW *win, char *str) { PDC_LOG(("winstr() - called: \n")); return winnstr(win, str, win->_maxx); } -int PDC_CDECL winnstr(WINDOW *win, char *str, int n) +int winnstr(WINDOW *win, char *str, int n) { chtype tmp; int oldy, oldx, imax, ic; @@ -144,7 +144,7 @@ int PDC_CDECL winnstr(WINDOW *win, char *str, int n) return OK; } -int PDC_CDECL mvinstr(int y, int x, char *str) +int mvinstr(int y, int x, char *str) { PDC_LOG(("mvinstr() - called: y %d x %d \n", y, x)); @@ -154,7 +154,7 @@ int PDC_CDECL mvinstr(int y, int x, char *str) return winnstr(stdscr, str, stdscr->_maxx); } -int PDC_CDECL mvinnstr(int y, int x, char *str, int n) +int mvinnstr(int y, int x, char *str, int n) { PDC_LOG(("mvinnstr() - called: y %d x %d n %d \n", y, x, n)); @@ -164,7 +164,7 @@ int PDC_CDECL mvinnstr(int y, int x, char *str, int n) return winnstr(stdscr, str, n); } -int PDC_CDECL mvwinstr(WINDOW *win, int y, int x, char *str) +int mvwinstr(WINDOW *win, int y, int x, char *str) { PDC_LOG(("mvwinstr() - called: y %d x %d \n", y, x)); @@ -174,7 +174,7 @@ int PDC_CDECL mvwinstr(WINDOW *win, int y, int x, char *str) return winnstr(win, str, win->_maxx); } -int PDC_CDECL mvwinnstr(WINDOW *win, int y, int x, char *str, int n) +int mvwinnstr(WINDOW *win, int y, int x, char *str, int n) { PDC_LOG(("mvwinnstr() - called: y %d x %d n %d \n", y, x, n)); diff --git a/pdcurses/kernel.c b/pdcurses/kernel.c index dd783495..384aea5e 100644 --- a/pdcurses/kernel.c +++ b/pdcurses/kernel.c @@ -72,7 +72,7 @@ #ifdef PDCDEBUG const char *rcsid_kernel = - "$Id: kernel.c,v 1.32 2006/02/04 03:00:01 wmcbrine Exp $"; + "$Id: kernel.c,v 1.33 2006/02/08 17:40:33 wmcbrine Exp $"; #endif RIPPEDOFFLINE linesripped[5]; @@ -185,7 +185,7 @@ char linesrippedoff = 0; **man-end**********************************************************************/ -int PDC_CDECL def_prog_mode(void) +int def_prog_mode(void) { PDC_LOG(("def_prog_mode() - called\n")); @@ -196,7 +196,7 @@ int PDC_CDECL def_prog_mode(void) return OK; } -int PDC_CDECL def_shell_mode(void) +int def_shell_mode(void) { PDC_LOG(("def_shell_mode() - called\n")); @@ -207,7 +207,7 @@ int PDC_CDECL def_shell_mode(void) return OK; } -int PDC_CDECL reset_prog_mode(void) +int reset_prog_mode(void) { #if defined(OS2) && !defined(EMXVIDEO) VIOMODEINFO modeInfo; @@ -255,7 +255,7 @@ int PDC_CDECL reset_prog_mode(void) return OK; } -int PDC_CDECL reset_shell_mode(void) +int reset_shell_mode(void) { #if defined(OS2) && !defined(EMXVIDEO) VIOMODEINFO modeInfo; @@ -310,7 +310,7 @@ int PDC_CDECL reset_shell_mode(void) return OK; } -int PDC_CDECL resetty(void) +int resetty(void) { #if defined(OS2) && !defined(EMXVIDEO) VIOMODEINFO modeInfo; @@ -359,7 +359,7 @@ int PDC_CDECL resetty(void) return c_save_tty.been_set ? OK : ERR; } -int PDC_CDECL savetty(void) +int savetty(void) { PDC_LOG(("savetty() - called\n")); @@ -369,14 +369,14 @@ int PDC_CDECL savetty(void) return OK; } -int PDC_CDECL curs_set(int visibility) +int curs_set(int visibility) { PDC_LOG(("curs_set() - called: visibility=%d\n", visibility)); return PDC_curs_set(visibility); } -int PDC_CDECL ripoffline(int line, int (*init)(WINDOW *, int)) +int ripoffline(int line, int (*init)(WINDOW *, int)) { PDC_LOG(("ripoffline() - called: line=%d\n", line)); @@ -389,7 +389,7 @@ int PDC_CDECL ripoffline(int line, int (*init)(WINDOW *, int)) return OK; } -int PDC_CDECL napms(int ms) +int napms(int ms) { PDC_LOG(("napms() - called: ms=%d\n", ms)); diff --git a/pdcurses/mouse.c b/pdcurses/mouse.c index cdd84219..84d7a826 100644 --- a/pdcurses/mouse.c +++ b/pdcurses/mouse.c @@ -32,7 +32,7 @@ #ifdef PDCDEBUG const char *rcsid_mouse = - "$Id: mouse.c,v 1.13 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: mouse.c,v 1.14 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -100,7 +100,7 @@ const char *rcsid_mouse = **man-end**********************************************************************/ -int PDC_CDECL mouse_set(unsigned long mbe) +int mouse_set(unsigned long mbe) { PDC_LOG(("mouse_set() - called: event %x\n", mbe)); @@ -109,7 +109,7 @@ int PDC_CDECL mouse_set(unsigned long mbe) return OK; } -int PDC_CDECL mouse_on(unsigned long mbe) +int mouse_on(unsigned long mbe) { PDC_LOG(("mouse_on() - called: event %x\n", mbe)); @@ -118,7 +118,7 @@ int PDC_CDECL mouse_on(unsigned long mbe) return OK; } -int PDC_CDECL mouse_off(unsigned long mbe) +int mouse_off(unsigned long mbe) { PDC_LOG(("mouse_off() - called: event %x\n", mbe)); @@ -127,7 +127,7 @@ int PDC_CDECL mouse_off(unsigned long mbe) return OK; } -int PDC_CDECL map_button(unsigned long button) +int map_button(unsigned long button) { PDC_LOG(("map_button() - called: button %x\n", button)); @@ -137,7 +137,7 @@ int PDC_CDECL map_button(unsigned long button) return OK; } -int PDC_CDECL request_mouse_pos(void) +int request_mouse_pos(void) { extern MOUSE_STATUS Trapped_Mouse_status; @@ -149,7 +149,7 @@ int PDC_CDECL request_mouse_pos(void) return OK; } -void PDC_CDECL wmouse_position(WINDOW *win, int *y, int *x) +void wmouse_position(WINDOW *win, int *y, int *x) { PDC_LOG(("wmouse_position() - called\n")); @@ -175,14 +175,14 @@ void PDC_CDECL wmouse_position(WINDOW *win, int *y, int *x) } } -unsigned long PDC_CDECL getmouse(void) +unsigned long getmouse(void) { PDC_LOG(("getmouse() - called\n")); return SP->_trap_mbe; } -unsigned long PDC_CDECL getbmap(void) +unsigned long getbmap(void) { PDC_LOG(("getbmap() - called\n")); diff --git a/pdcurses/move.c b/pdcurses/move.c index 6ee8bfc8..b062fa5b 100644 --- a/pdcurses/move.c +++ b/pdcurses/move.c @@ -25,7 +25,7 @@ #ifdef PDCDEBUG const char *rcsid_move = - "$Id: move.c,v 1.10 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: move.c,v 1.11 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -57,7 +57,7 @@ const char *rcsid_move = **man-end**********************************************************************/ -int PDC_CDECL move(int y, int x) +int move(int y, int x) { PDC_LOG(("move() - called: y=%d x=%d\n", y, x)); @@ -73,7 +73,7 @@ int PDC_CDECL move(int y, int x) return OK; } -int PDC_CDECL wmove(WINDOW *win, int y, int x) +int wmove(WINDOW *win, int y, int x) { PDC_LOG(("wmove() - called: y=%d x=%d\n", y, x)); diff --git a/pdcurses/outopts.c b/pdcurses/outopts.c index 799e8052..cccdb755 100644 --- a/pdcurses/outopts.c +++ b/pdcurses/outopts.c @@ -32,7 +32,7 @@ #ifdef PDCDEBUG const char *rcsid_outopts = - "$Id: outopts.c,v 1.15 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: outopts.c,v 1.16 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -127,7 +127,7 @@ const char *rcsid_outopts = **man-end**********************************************************************/ -int PDC_CDECL clearok(WINDOW *win, bool bf) +int clearok(WINDOW *win, bool bf) { PDC_LOG(("clearok() - called\n")); @@ -139,7 +139,7 @@ int PDC_CDECL clearok(WINDOW *win, bool bf) return OK; } -int PDC_CDECL idlok(WINDOW *win, bool bf) +int idlok(WINDOW *win, bool bf) { PDC_LOG(("idlok() - called\n")); @@ -151,7 +151,7 @@ int PDC_CDECL idlok(WINDOW *win, bool bf) return OK; } -void PDC_CDECL idcok(WINDOW *win, bool bf) +void idcok(WINDOW *win, bool bf) { PDC_LOG(("idcok() - called\n")); @@ -159,7 +159,7 @@ void PDC_CDECL idcok(WINDOW *win, bool bf) win->_use_idc = bf; } -void PDC_CDECL immedok(WINDOW *win, bool bf) +void immedok(WINDOW *win, bool bf) { PDC_LOG(("immedok() - called\n")); @@ -167,7 +167,7 @@ void PDC_CDECL immedok(WINDOW *win, bool bf) win->_immed = bf; } -int PDC_CDECL leaveok(WINDOW *win, bool bf) +int leaveok(WINDOW *win, bool bf) { PDC_LOG(("leaveok() - called\n")); @@ -184,14 +184,14 @@ int PDC_CDECL leaveok(WINDOW *win, bool bf) return OK; } -int PDC_CDECL setscrreg(int top, int bottom) +int setscrreg(int top, int bottom) { PDC_LOG(("setscrreg() - called: top %d bottom %d\n", top, bottom)); return wsetscrreg(stdscr, top, bottom); } -int PDC_CDECL wsetscrreg(WINDOW *win, int top, int bottom) +int wsetscrreg(WINDOW *win, int top, int bottom) { PDC_LOG(("wsetscrreg() - called: top %d bottom %d\n", top, bottom)); @@ -210,7 +210,7 @@ int PDC_CDECL wsetscrreg(WINDOW *win, int top, int bottom) return ERR; } -int PDC_CDECL scrollok(WINDOW *win, bool bf) +int scrollok(WINDOW *win, bool bf) { PDC_LOG(("scrollok() - called\n")); @@ -222,7 +222,7 @@ int PDC_CDECL scrollok(WINDOW *win, bool bf) return OK; } -int PDC_CDECL raw_output(bool bf) +int raw_output(bool bf) { PDC_LOG(("raw_output() - called\n")); diff --git a/pdcurses/overlay.c b/pdcurses/overlay.c index 76184c2e..8a24e67f 100644 --- a/pdcurses/overlay.c +++ b/pdcurses/overlay.c @@ -32,7 +32,7 @@ #ifdef PDCDEBUG const char *rcsid_overlay = - "$Id: overlay.c,v 1.12 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: overlay.c,v 1.13 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -94,7 +94,7 @@ const char *rcsid_overlay = **man-end**********************************************************************/ -int PDC_CDECL overlay(const WINDOW *src_w, WINDOW *dst_w) +int overlay(const WINDOW *src_w, WINDOW *dst_w) { int first_line, first_col, last_line, last_col; int src_start_x, src_start_y, dst_start_x, dst_start_y; @@ -154,7 +154,7 @@ int PDC_CDECL overlay(const WINDOW *src_w, WINDOW *dst_w) TRUE); } -int PDC_CDECL overwrite(const WINDOW *src_w, WINDOW *dst_w) +int overwrite(const WINDOW *src_w, WINDOW *dst_w) { int first_line, first_col, last_line, last_col; int src_start_x, src_start_y, dst_start_x, dst_start_y; @@ -214,7 +214,7 @@ int PDC_CDECL overwrite(const WINDOW *src_w, WINDOW *dst_w) FALSE); } -int PDC_CDECL copywin(const WINDOW *src_w, WINDOW *dst_w, int src_tr, +int copywin(const WINDOW *src_w, WINDOW *dst_w, int src_tr, int src_tc, int dst_tr, int dst_tc, int dst_br, int dst_bc, int overlay) { diff --git a/pdcurses/pad.c b/pdcurses/pad.c index fcdd366b..623bfdd5 100644 --- a/pdcurses/pad.c +++ b/pdcurses/pad.c @@ -37,7 +37,7 @@ #ifdef PDCDEBUG const char *rcsid_pad = - "$Id: pad.c,v 1.14 2006/02/07 14:12:42 wmcbrine Exp $"; + "$Id: pad.c,v 1.15 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /* save values for pechochar() */ @@ -120,7 +120,7 @@ static int save_sminrow, save_smincol, save_smaxrow, save_smaxcol; **man-end**********************************************************************/ -WINDOW * PDC_CDECL newpad(int nlines, int ncols) +WINDOW * newpad(int nlines, int ncols) { extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); @@ -173,7 +173,7 @@ WINDOW * PDC_CDECL newpad(int nlines, int ncols) return win; } -WINDOW * PDC_CDECL subpad(WINDOW *orig, int nlines, int ncols, +WINDOW * subpad(WINDOW *orig, int nlines, int ncols, int begin_y, int begin_x) { WINDOW *win; @@ -231,7 +231,7 @@ WINDOW * PDC_CDECL subpad(WINDOW *orig, int nlines, int ncols, return win; } -int PDC_CDECL prefresh(WINDOW *win, int py, int px, int sy1, int sx1, +int prefresh(WINDOW *win, int py, int px, int sy1, int sx1, int sy2, int sx2) { PDC_LOG(("prefresh() - called\n")); @@ -246,7 +246,7 @@ int PDC_CDECL prefresh(WINDOW *win, int py, int px, int sy1, int sx1, return OK; } -int PDC_CDECL pnoutrefresh(WINDOW *w, int py, int px, int sy1, int sx1, +int pnoutrefresh(WINDOW *w, int py, int px, int sy1, int sx1, int sy2, int sx2) { int num_cols; @@ -317,7 +317,7 @@ int PDC_CDECL pnoutrefresh(WINDOW *w, int py, int px, int sy1, int sx1, return OK; } -int PDC_CDECL pechochar(WINDOW *pad, chtype ch) +int pechochar(WINDOW *pad, chtype ch) { PDC_LOG(("pechochar() - called\n")); diff --git a/pdcurses/pdcdebug.c b/pdcurses/pdcdebug.c index 5c4ded9f..1397225f 100644 --- a/pdcurses/pdcdebug.c +++ b/pdcurses/pdcdebug.c @@ -26,7 +26,7 @@ #ifdef PDCDEBUG const char *rcsid_PDCdebug = - "$Id: pdcdebug.c,v 1.13 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: pdcdebug.c,v 1.14 2006/02/08 17:40:33 wmcbrine Exp $"; #endif bool trace_on = FALSE; @@ -49,7 +49,7 @@ bool trace_on = FALSE; **man-end**********************************************************************/ -void PDC_CDECL PDC_debug(char *fmt, ...) +void PDC_debug(char *fmt, ...) { va_list args; FILE *dbfp; diff --git a/pdcurses/pdcwin.c b/pdcurses/pdcwin.c index d94125c4..81d1ec8d 100644 --- a/pdcurses/pdcwin.c +++ b/pdcurses/pdcwin.c @@ -25,7 +25,7 @@ #ifdef PDCDEBUG const char *rcsid_PDCwin = - "$Id: pdcwin.c,v 1.23 2006/02/06 01:55:00 wmcbrine Exp $"; + "$Id: pdcwin.c,v 1.24 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -307,7 +307,7 @@ void PDC_sync(WINDOW *win) **man-end**********************************************************************/ -int PDC_CDECL PDC_chadd(WINDOW *win, chtype ch, bool xlat, bool advance) +int PDC_chadd(WINDOW *win, chtype ch, bool xlat, bool advance) { int x, y, newx, ts, retval; chtype attr, bktmp; diff --git a/pdcurses/printw.c b/pdcurses/printw.c index 11bbdeb6..9144ca3d 100644 --- a/pdcurses/printw.c +++ b/pdcurses/printw.c @@ -36,7 +36,7 @@ #ifdef PDCDEBUG const char *rcsid_printw = - "$Id: printw.c,v 1.15 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: printw.c,v 1.16 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -92,7 +92,7 @@ const char *rcsid_printw = **man-end**********************************************************************/ -int PDC_CDECL printw(char *fmt, ...) +int printw(char *fmt, ...) { va_list args; int retval; @@ -106,7 +106,7 @@ int PDC_CDECL printw(char *fmt, ...) return retval; } -int PDC_CDECL wprintw(WINDOW *win, char *fmt, ...) +int wprintw(WINDOW *win, char *fmt, ...) { va_list args; int retval; @@ -120,7 +120,7 @@ int PDC_CDECL wprintw(WINDOW *win, char *fmt, ...) return retval; } -int PDC_CDECL mvprintw(int y, int x, char *fmt, ...) +int mvprintw(int y, int x, char *fmt, ...) { va_list args; int retval; @@ -137,7 +137,7 @@ int PDC_CDECL mvprintw(int y, int x, char *fmt, ...) return retval; } -int PDC_CDECL mvwprintw(WINDOW *win, int y, int x, char *fmt, ...) +int mvwprintw(WINDOW *win, int y, int x, char *fmt, ...) { va_list args; int retval; @@ -154,7 +154,7 @@ int PDC_CDECL mvwprintw(WINDOW *win, int y, int x, char *fmt, ...) return retval; } -int PDC_CDECL vwprintw(WINDOW *win, char *fmt, va_list varglist) +int vwprintw(WINDOW *win, char *fmt, va_list varglist) { char printbuf[513]; int len; @@ -166,7 +166,7 @@ int PDC_CDECL vwprintw(WINDOW *win, char *fmt, va_list varglist) return (waddstr(win, printbuf) == ERR) ? ERR : len; } -int PDC_CDECL vw_printw(WINDOW *win, char *fmt, va_list varglist) +int vw_printw(WINDOW *win, char *fmt, va_list varglist) { PDC_LOG(("vw_printw() - called\n")); diff --git a/pdcurses/refresh.c b/pdcurses/refresh.c index 28dd712b..974890cc 100644 --- a/pdcurses/refresh.c +++ b/pdcurses/refresh.c @@ -41,7 +41,7 @@ #ifdef PDCDEBUG const char *rcsid_refresh = - "$Id: refresh.c,v 1.16 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: refresh.c,v 1.17 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -102,14 +102,14 @@ const char *rcsid_refresh = **man-end**********************************************************************/ -int PDC_CDECL refresh(void) +int refresh(void) { PDC_LOG(("refresh() - called\n")); return wrefresh(stdscr); } -int PDC_CDECL wrefresh(WINDOW *win) +int wrefresh(WINDOW *win) { bool save_clear; @@ -132,7 +132,7 @@ int PDC_CDECL wrefresh(WINDOW *win) return OK; } -int PDC_CDECL wnoutrefresh(WINDOW *win) +int wnoutrefresh(WINDOW *win) { int first; /* first changed char on line */ int last; /* last changed char on line */ @@ -206,7 +206,7 @@ int PDC_CDECL wnoutrefresh(WINDOW *win) return OK; } -int PDC_CDECL doupdate(void) +int doupdate(void) { int i; #ifdef REGISTERWINDOWS @@ -283,7 +283,7 @@ int PDC_CDECL doupdate(void) return OK; } -int PDC_CDECL redrawwin(WINDOW *win) +int redrawwin(WINDOW *win) { PDC_LOG(("redrawwin() - called: win=%x\n", win)); @@ -293,7 +293,7 @@ int PDC_CDECL redrawwin(WINDOW *win) return wredrawln(win, 0, win->_maxy); } -int PDC_CDECL wredrawln(WINDOW *win, int start, int num) +int wredrawln(WINDOW *win, int start, int num) { int i; diff --git a/pdcurses/scanw.c b/pdcurses/scanw.c index f31e85c6..528c3e9d 100644 --- a/pdcurses/scanw.c +++ b/pdcurses/scanw.c @@ -44,7 +44,7 @@ #ifdef PDCDEBUG const char *rcsid_scanw = - "$Id: scanw.c,v 1.15 2006/01/30 12:17:17 wmcbrine Exp $"; + "$Id: scanw.c,v 1.16 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -92,7 +92,7 @@ const char *rcsid_scanw = **man-end**********************************************************************/ -int PDC_CDECL scanw(char *fmt, ...) +int scanw(char *fmt, ...) { va_list args; int retval; @@ -106,7 +106,7 @@ int PDC_CDECL scanw(char *fmt, ...) return retval; } -int PDC_CDECL wscanw(WINDOW *win, char *fmt, ...) +int wscanw(WINDOW *win, char *fmt, ...) { va_list args; int retval; @@ -120,7 +120,7 @@ int PDC_CDECL wscanw(WINDOW *win, char *fmt, ...) return retval; } -int PDC_CDECL mvscanw(int y, int x, char *fmt, ...) +int mvscanw(int y, int x, char *fmt, ...) { va_list args; int retval; @@ -137,7 +137,7 @@ int PDC_CDECL mvscanw(int y, int x, char *fmt, ...) return retval; } -int PDC_CDECL mvwscanw(WINDOW *win, int y, int x, char *fmt, ...) +int mvwscanw(WINDOW *win, int y, int x, char *fmt, ...) { va_list args; int retval; @@ -154,7 +154,7 @@ int PDC_CDECL mvwscanw(WINDOW *win, int y, int x, char *fmt, ...) return retval; } -int PDC_CDECL vwscanw(WINDOW *win, char *fmt, va_list varglist) +int vwscanw(WINDOW *win, char *fmt, va_list varglist) { char scanbuf[513]; @@ -166,7 +166,7 @@ int PDC_CDECL vwscanw(WINDOW *win, char *fmt, va_list varglist) return vsscanf(scanbuf, fmt, varglist); } -int PDC_CDECL vw_scanw(WINDOW *win, char *fmt, va_list varglist) +int vw_scanw(WINDOW *win, char *fmt, va_list varglist) { PDC_LOG(("vw_scanw() - called\n")); diff --git a/pdcurses/scroll.c b/pdcurses/scroll.c index ca9eacad..ab084fbd 100644 --- a/pdcurses/scroll.c +++ b/pdcurses/scroll.c @@ -26,7 +26,7 @@ #ifdef PDCDEBUG const char *rcsid_scroll = - "$Id: scroll.c,v 1.13 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: scroll.c,v 1.14 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -75,14 +75,14 @@ const char *rcsid_scroll = **man-end**********************************************************************/ -int PDC_CDECL scroll(WINDOW *win) +int scroll(WINDOW *win) { PDC_LOG(("scroll() - called\n")); return wscrl(win, 1); } -int PDC_CDECL wscrl(WINDOW *win, int n) +int wscrl(WINDOW *win, int n) { int i, l; chtype blank, *ptr, *temp; @@ -158,7 +158,7 @@ int PDC_CDECL wscrl(WINDOW *win, int n) return OK; } -int PDC_CDECL scrl(int n) +int scrl(int n) { PDC_LOG(("scrl() - called\n")); diff --git a/pdcurses/slk.c b/pdcurses/slk.c index eed2f295..03d43396 100644 --- a/pdcurses/slk.c +++ b/pdcurses/slk.c @@ -36,7 +36,7 @@ #ifdef PDCDEBUG const char *rcsid_slk = - "$Id: slk.c,v 1.16 2006/02/07 14:12:42 wmcbrine Exp $"; + "$Id: slk.c,v 1.17 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -137,7 +137,7 @@ static struct { with index line) 55 = 5 - 5 format (extended for PC, 10 function keys) */ -int PDC_CDECL slk_init(int fmt) +int slk_init(int fmt) { PDC_LOG(("slk_init() - called\n")); @@ -285,14 +285,14 @@ static int PDC_slk_set(int label_num, const char *label_str, 1 = center 2 = right */ -int PDC_CDECL slk_set(int label_num, const char *label_str, int label_fmt) +int slk_set(int label_num, const char *label_str, int label_fmt) { PDC_LOG(("slk_set() - called\n")); return PDC_slk_set(label_num, label_str, label_fmt, 1); } -int PDC_CDECL slk_refresh(void) +int slk_refresh(void) { PDC_LOG(("slk_refresh() - called\n")); @@ -303,7 +303,7 @@ int PDC_CDECL slk_refresh(void) return doupdate(); } -int PDC_CDECL slk_noutrefresh(void) +int slk_noutrefresh(void) { PDC_LOG(("slk_noutrefresh() - called\n")); @@ -313,7 +313,7 @@ int PDC_CDECL slk_noutrefresh(void) return wnoutrefresh(SP->slk_winptr); } -char * PDC_CDECL slk_label(int labnum) +char * slk_label(int labnum) { PDC_LOG(("slk_label() - called\n")); @@ -326,7 +326,7 @@ char * PDC_CDECL slk_label(int labnum) return slk_temp_string; /* only good temporarily */ } -int PDC_CDECL slk_clear(void) +int slk_clear(void) { int i; @@ -341,7 +341,7 @@ int PDC_CDECL slk_clear(void) return wrefresh(SP->slk_winptr); } -int PDC_CDECL slk_restore(void) +int slk_restore(void) { int i; chtype attr = SP->slk_winptr->_attrs; @@ -359,14 +359,14 @@ int PDC_CDECL slk_restore(void) return wrefresh(SP->slk_winptr); } -int PDC_CDECL slk_touch(void) +int slk_touch(void) { PDC_LOG(("slk_touch() - called\n")); return touchwin(SP->slk_winptr); } -int PDC_CDECL slk_attron(const chtype attrs) +int slk_attron(const chtype attrs) { int i, rc; @@ -380,7 +380,7 @@ int PDC_CDECL slk_attron(const chtype attrs) return rc; } -int PDC_CDECL slk_attroff(const chtype attrs) +int slk_attroff(const chtype attrs) { int i, rc; @@ -394,7 +394,7 @@ int PDC_CDECL slk_attroff(const chtype attrs) return rc; } -int PDC_CDECL slk_attrset(const chtype attrs) +int slk_attrset(const chtype attrs) { int i, rc; @@ -408,7 +408,7 @@ int PDC_CDECL slk_attrset(const chtype attrs) return rc; } -int PDC_CDECL slk_color(short color_pair) +int slk_color(short color_pair) { int i, rc; diff --git a/pdcurses/termattr.c b/pdcurses/termattr.c index c5abbe2b..301907e2 100644 --- a/pdcurses/termattr.c +++ b/pdcurses/termattr.c @@ -34,7 +34,7 @@ #ifdef PDCDEBUG const char *rcsid_termattr = - "$Id: termattr.c,v 1.19 2006/02/07 20:16:52 wmcbrine Exp $"; + "$Id: termattr.c,v 1.20 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -127,42 +127,42 @@ const char *rcsid_termattr = **man-end**********************************************************************/ -int PDC_CDECL baudrate(void) +int baudrate(void) { PDC_LOG(("baudrate() - called\n")); return SP->direct_video ? INT_MAX : 19200; } -char PDC_CDECL erasechar(void) +char erasechar(void) { PDC_LOG(("erasechar() - called\n")); return _ECHAR; /* character delete char (^H) */ } -bool PDC_CDECL has_ic(void) +bool has_ic(void) { PDC_LOG(("has_ic() - called\n")); return TRUE; } -bool PDC_CDECL has_il(void) +bool has_il(void) { PDC_LOG(("has_il() - called\n")); return TRUE; } -char PDC_CDECL killchar(void) +char killchar(void) { PDC_LOG(("killchar() - called\n")); return _DLCHAR; /* line delete char (^U) */ } -char * PDC_CDECL longname(void) +char * longname(void) { static char _display[128]; char *p = _display; @@ -243,7 +243,7 @@ char * PDC_CDECL longname(void) return _display; } -chtype PDC_CDECL termattrs(void) +chtype termattrs(void) { chtype temp = (A_NORMAL | A_BOLD | A_BLINK | A_REVERSE | A_UNDERLINE | A_ITALIC); @@ -258,14 +258,14 @@ chtype PDC_CDECL termattrs(void) return temp; } -char * PDC_CDECL termname(void) +char * termname(void) { PDC_LOG(("termname() - called\n")); return "pdcurses"; } -char PDC_CDECL wordchar(void) +char wordchar(void) { PDC_LOG(("wordchar() - called\n")); diff --git a/pdcurses/terminfo.c b/pdcurses/terminfo.c index 185f59ae..db17e0a3 100644 --- a/pdcurses/terminfo.c +++ b/pdcurses/terminfo.c @@ -26,7 +26,7 @@ #ifdef PDCDEBUG const char *rcsid_terminfo = - "$Id: terminfo.c,v 1.15 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: terminfo.c,v 1.16 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -75,7 +75,7 @@ const char *rcsid_terminfo = TERMINAL *cur_term = NULL; -int PDC_CDECL mvcur(int oldrow, int oldcol, int newrow, int newcol) +int mvcur(int oldrow, int oldcol, int newrow, int newcol) { PDC_LOG(("mvcur() - called: oldrow %d oldcol %d newrow %d newcol %d\n", oldrow, oldcol, newrow, newcol)); @@ -91,21 +91,21 @@ int PDC_CDECL mvcur(int oldrow, int oldcol, int newrow, int newcol) return OK; } -int PDC_CDECL del_curterm(TERMINAL *oterm) +int del_curterm(TERMINAL *oterm) { PDC_LOG(("del_curterm() - called\n")); return ERR; } -int PDC_CDECL putp(const char *str) +int putp(const char *str) { PDC_LOG(("putp() - called: str %s\n", str)); return ERR; } -int PDC_CDECL restartterm(char *term, int filedes, int *errret) +int restartterm(char *term, int filedes, int *errret) { PDC_LOG(("restartterm() - called\n")); @@ -115,21 +115,21 @@ int PDC_CDECL restartterm(char *term, int filedes, int *errret) return ERR; } -TERMINAL * PDC_CDECL set_curterm(TERMINAL *nterm) +TERMINAL * set_curterm(TERMINAL *nterm) { PDC_LOG(("set_curterm() - called\n")); return (TERMINAL *)NULL; } -int PDC_CDECL setterm(char *term) +int setterm(char *term) { PDC_LOG(("setterm() - called\n")); return ERR; } -int PDC_CDECL setupterm(char *term, int filedes, int *errret) +int setupterm(char *term, int filedes, int *errret) { PDC_LOG(("setupterm() - called\n")); @@ -141,63 +141,63 @@ int PDC_CDECL setupterm(char *term, int filedes, int *errret) return ERR; } -int PDC_CDECL tgetent(char *bp, const char *name) +int tgetent(char *bp, const char *name) { PDC_LOG(("tgetent() - called: name %s\n", name)); return ERR; } -int PDC_CDECL tgetflag(char *id) +int tgetflag(char *id) { PDC_LOG(("tgetflag() - called: id %s\n", id)); return ERR; } -int PDC_CDECL tgetnum(char *id) +int tgetnum(char *id) { PDC_LOG(("tgetnum() - called: id %s\n", id)); return ERR; } -char * PDC_CDECL tgetstr(char *id, char **area) +char * tgetstr(char *id, char **area) { PDC_LOG(("tgetstr() - called: id %s\n", id)); return (char *)NULL; } -char * PDC_CDECL tgoto(char *cap, int col, int row) +char * tgoto(char *cap, int col, int row) { PDC_LOG(("tgoto() - called\n")); return (char *)NULL; } -int PDC_CDECL tigetflag(char *capname) +int tigetflag(char *capname) { PDC_LOG(("tigetflag() - called: capname %s\n", capname)); return -1; } -int PDC_CDECL tigetnum(char *capname) +int tigetnum(char *capname) { PDC_LOG(("tigetnum() - called: capname %s\n", capname)); return -2; } -char * PDC_CDECL tigetstr(char *capname) +char * tigetstr(char *capname) { PDC_LOG(("tigetstr() - called: capname %s\n", capname)); return (char *)(-1); } -char * PDC_CDECL tparm(char *cap, long p1, long p2, long p3, long p4, +char * tparm(char *cap, long p1, long p2, long p3, long p4, long p5, long p6, long p7, long p8, long p9) { PDC_LOG(("tparm() - called: cap %s\n", cap)); @@ -205,21 +205,21 @@ char * PDC_CDECL tparm(char *cap, long p1, long p2, long p3, long p4, return (char *)NULL; } -int PDC_CDECL tputs(const char *str, int affcnt, int (*putfunc)(int)) +int tputs(const char *str, int affcnt, int (*putfunc)(int)) { PDC_LOG(("tputs() - called\n")); return ERR; } -int PDC_CDECL vidattr(chtype attr) +int vidattr(chtype attr) { PDC_LOG(("vidattr() - called: attr %d\n", attr)); return ERR; } -int PDC_CDECL vidputs(chtype attr, int (*putfunc)(int)) +int vidputs(chtype attr, int (*putfunc)(int)) { PDC_LOG(("vidputs() - called: attr %d\n", attr)); diff --git a/pdcurses/touch.c b/pdcurses/touch.c index 825c8f59..d65c2efd 100644 --- a/pdcurses/touch.c +++ b/pdcurses/touch.c @@ -35,7 +35,7 @@ #ifdef PDCDEBUG const char *rcsid_touch = - "$Id: touch.c,v 1.11 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: touch.c,v 1.12 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -92,7 +92,7 @@ const char *rcsid_touch = **man-end**********************************************************************/ -int PDC_CDECL touchwin(WINDOW *win) +int touchwin(WINDOW *win) { int i; @@ -110,7 +110,7 @@ int PDC_CDECL touchwin(WINDOW *win) return OK; } -int PDC_CDECL touchline(WINDOW *win, int start, int count) +int touchline(WINDOW *win, int start, int count) { int i; @@ -130,7 +130,7 @@ int PDC_CDECL touchline(WINDOW *win, int start, int count) return OK; } -int PDC_CDECL untouchwin(WINDOW *win) +int untouchwin(WINDOW *win) { int i; @@ -148,7 +148,7 @@ int PDC_CDECL untouchwin(WINDOW *win) return OK; } -int PDC_CDECL wtouchln(WINDOW *win, int y, int n, int changed) +int wtouchln(WINDOW *win, int y, int n, int changed) { int i; @@ -175,7 +175,7 @@ int PDC_CDECL wtouchln(WINDOW *win, int y, int n, int changed) return OK; } -bool PDC_CDECL is_linetouched(WINDOW *win, int line) +bool is_linetouched(WINDOW *win, int line) { PDC_LOG(("is_linetouched() - called: win=%x line=%d\n", win, line)); @@ -185,7 +185,7 @@ bool PDC_CDECL is_linetouched(WINDOW *win, int line) return (win->_firstch[line] != _NO_CHANGE) ? TRUE : FALSE; } -bool PDC_CDECL is_wintouched(WINDOW *win) +bool is_wintouched(WINDOW *win) { int i; diff --git a/pdcurses/util.c b/pdcurses/util.c index cf2ff0cd..b4f39ca1 100644 --- a/pdcurses/util.c +++ b/pdcurses/util.c @@ -37,7 +37,7 @@ #ifdef PDCDEBUG const char *rcsid_util = - "$Id: util.c,v 1.25 2006/02/06 01:13:18 wmcbrine Exp $"; + "$Id: util.c,v 1.26 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -107,7 +107,7 @@ const char *rcsid_util = static char strbuf[3] = {0, 0, 0}; -char * PDC_CDECL unctrl(chtype c) +char * unctrl(chtype c) { chtype ic; @@ -197,7 +197,7 @@ static char *key_name[] = { "KEY_SUP", "KEY_SDOWN" }; -char * PDC_CDECL keyname(int key) +char * keyname(int key) { PDC_LOG(("keyname() - called: key %d\n", key)); @@ -210,7 +210,7 @@ char * PDC_CDECL keyname(int key) return "NO KEY NAME"; } -bool PDC_CDECL has_key(int key) +bool has_key(int key) { PDC_LOG(("has_key() - called: key %d\n",key)); @@ -220,38 +220,38 @@ bool PDC_CDECL has_key(int key) && key <= (int)(sizeof(key_name) / sizeof(key_name[0])); } -void PDC_CDECL filter(void) +void filter(void) { PDC_LOG(("filter() - called\n")); } -void PDC_CDECL use_env(bool x) +void use_env(bool x) { PDC_LOG(("use_env() - called: x %d\n", x)); } -int PDC_CDECL putwin(WINDOW *win, FILE *filep) +int putwin(WINDOW *win, FILE *filep) { PDC_LOG(("putwin() - called\n")); return ERR; } -WINDOW * PDC_CDECL getwin(FILE *filep) +WINDOW * getwin(FILE *filep) { PDC_LOG(("getwin() - called\n")); return (WINDOW *)NULL; } -int PDC_CDECL delay_output(int ms) +int delay_output(int ms) { PDC_LOG(("delay_output() - called: ms %d\n", ms)); return napms(ms); } -int PDC_CDECL flushinp(void) +int flushinp(void) { #ifdef WIN32 extern HANDLE hConIn; @@ -295,14 +295,14 @@ int PDC_CDECL flushinp(void) #undef traceon #undef traceoff -void PDC_CDECL traceon(void) +void traceon(void) { PDC_LOG(("traceon() - called\n")); trace_on = TRUE; } -void PDC_CDECL traceoff(void) +void traceoff(void) { PDC_LOG(("traceoff() - called\n")); diff --git a/pdcurses/window.c b/pdcurses/window.c index 0aa9fc0e..c26f757e 100644 --- a/pdcurses/window.c +++ b/pdcurses/window.c @@ -48,7 +48,7 @@ #ifdef PDCDEBUG const char *rcsid_window = - "$Id: window.c,v 1.17 2006/02/06 01:55:00 wmcbrine Exp $"; + "$Id: window.c,v 1.18 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -158,7 +158,7 @@ const char *rcsid_window = **man-end**********************************************************************/ -WINDOW * PDC_CDECL newwin(int nlines, int ncols, int begy, int begx) +WINDOW * newwin(int nlines, int ncols, int begy, int begx) { extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); @@ -209,7 +209,7 @@ WINDOW * PDC_CDECL newwin(int nlines, int ncols, int begy, int begx) return win; } -int PDC_CDECL delwin(WINDOW *win) +int delwin(WINDOW *win) { extern void (*fre)(void*); @@ -238,7 +238,7 @@ int PDC_CDECL delwin(WINDOW *win) return OK; } -int PDC_CDECL mvwin(WINDOW *win, int y, int x) +int mvwin(WINDOW *win, int y, int x) { PDC_LOG(("mvwin() - called\n")); @@ -254,7 +254,7 @@ int PDC_CDECL mvwin(WINDOW *win, int y, int x) return OK; } -WINDOW * PDC_CDECL subwin(WINDOW *orig, int nlines, int ncols, +WINDOW * subwin(WINDOW *orig, int nlines, int ncols, int begin_y, int begin_x) { WINDOW *win; @@ -303,14 +303,14 @@ WINDOW * PDC_CDECL subwin(WINDOW *orig, int nlines, int ncols, return win; } -WINDOW * PDC_CDECL derwin(WINDOW *orig, int nlines, int ncols, +WINDOW * derwin(WINDOW *orig, int nlines, int ncols, int begin_y, int begin_x) { return subwin(orig, nlines, ncols, begin_y + orig->_begy, begin_x + orig->_begx); } -int PDC_CDECL mvderwin(WINDOW *win, int par_y, int par_x) +int mvderwin(WINDOW *win, int par_y, int par_x) { int i, j; WINDOW *mypar; @@ -336,7 +336,7 @@ int PDC_CDECL mvderwin(WINDOW *win, int par_y, int par_x) return OK; } -WINDOW * PDC_CDECL dupwin(WINDOW *win) +WINDOW * dupwin(WINDOW *win) { extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); @@ -427,7 +427,7 @@ WINDOW * PDC_CDECL dupwin(WINDOW *win) } -WINDOW * PDC_CDECL resize_window(WINDOW *win, int lins, int cols) +WINDOW * resize_window(WINDOW *win, int lins, int cols) { extern void *(*callc)(size_t, size_t); extern void (*fre)(void *); @@ -520,7 +520,7 @@ WINDOW * PDC_CDECL resize_window(WINDOW *win, int lins, int cols) return new; } -void PDC_CDECL wsyncup(WINDOW *win) +void wsyncup(WINDOW *win) { WINDOW *tmp; @@ -530,7 +530,7 @@ void PDC_CDECL wsyncup(WINDOW *win) touchwin(tmp); } -int PDC_CDECL syncok(WINDOW *win, bool bf) +int syncok(WINDOW *win, bool bf) { PDC_LOG(("syncok() - called\n")); @@ -542,7 +542,7 @@ int PDC_CDECL syncok(WINDOW *win, bool bf) return OK; } -void PDC_CDECL wcursyncup(WINDOW *win) +void wcursyncup(WINDOW *win) { WINDOW *tmp; @@ -553,7 +553,7 @@ void PDC_CDECL wcursyncup(WINDOW *win) tmp->_parx + tmp->_curx); } -void PDC_CDECL wsyncdown(WINDOW *win) +void wsyncdown(WINDOW *win) { WINDOW *tmp; diff --git a/term.h b/term.h index 850185fb..829d6a0a 100644 --- a/term.h +++ b/term.h @@ -16,7 +16,7 @@ * See the file maintain.er for details of the current maintainer. **************************************************************************/ -/* $Id: term.h,v 1.4 2006/01/28 16:53:25 wmcbrine Exp $ */ +/* $Id: term.h,v 1.5 2006/02/08 17:40:32 wmcbrine Exp $ */ /* PDCurses doesn't operate with terminfo, but we need these functions for compatibility, to allow some things (notably, interface libraries for @@ -45,23 +45,23 @@ __declspec(dllexport) extern TERMINAL *cur_term; extern TERMINAL *cur_term; #endif -int PDC_CDECL del_curterm(TERMINAL *); -int PDC_CDECL putp(const char *); -int PDC_CDECL restartterm(char *, int, int *); -TERMINAL* PDC_CDECL set_curterm(TERMINAL *); -int PDC_CDECL setterm(char *); -int PDC_CDECL setupterm(char *, int, int *); -int PDC_CDECL tgetent(char *, const char *); -int PDC_CDECL tgetflag(char *); -int PDC_CDECL tgetnum(char *); -char * PDC_CDECL tgetstr(char *, char **); -char * PDC_CDECL tgoto(char *, int, int); -int PDC_CDECL tigetflag(char *); -int PDC_CDECL tigetnum(char *); -char * PDC_CDECL tigetstr(char *); -char * PDC_CDECL tparm(char *,long, long, long, long, long, +int del_curterm(TERMINAL *); +int putp(const char *); +int restartterm(char *, int, int *); +TERMINAL *set_curterm(TERMINAL *); +int setterm(char *); +int setupterm(char *, int, int *); +int tgetent(char *, const char *); +int tgetflag(char *); +int tgetnum(char *); +char *tgetstr(char *, char **); +char *tgoto(char *, int, int); +int tigetflag(char *); +int tigetnum(char *); +char *tigetstr(char *); +char *tparm(char *,long, long, long, long, long, long, long, long, long); -int PDC_CDECL tputs(const char *, int, int (*)(int)); +int tputs(const char *, int, int (*)(int)); #endif /* __PDCURSES_TERM_H__ */ diff --git a/win32/pdcclip.c b/win32/pdcclip.c index 681f0a47..052acd5e 100644 --- a/win32/pdcclip.c +++ b/win32/pdcclip.c @@ -22,7 +22,7 @@ #ifdef PDCDEBUG const char *rcsid_PDCclip = - "$Id: pdcclip.c,v 1.9 2006/01/30 02:10:55 wmcbrine Exp $"; + "$Id: pdcclip.c,v 1.10 2006/02/08 17:40:33 wmcbrine Exp $"; #endif /*man-start********************************************************************* @@ -52,7 +52,7 @@ const char *rcsid_PDCclip = **man-end**********************************************************************/ -int PDC_CDECL PDC_getclipboard(char **contents, long *length) +int PDC_getclipboard(char **contents, long *length) { HANDLE handle; long len; @@ -107,7 +107,7 @@ int PDC_CDECL PDC_getclipboard(char **contents, long *length) **man-end**********************************************************************/ -int PDC_CDECL PDC_setclipboard(char *contents, long length) +int PDC_setclipboard(char *contents, long length) { HGLOBAL ptr1; LPTSTR ptr2; @@ -159,7 +159,7 @@ int PDC_CDECL PDC_setclipboard(char *contents, long length) **man-end**********************************************************************/ -int PDC_CDECL PDC_freeclipboard(char *contents) +int PDC_freeclipboard(char *contents) { PDC_LOG(("PDC_freeclipboard() - called\n")); @@ -184,7 +184,7 @@ int PDC_CDECL PDC_freeclipboard(char *contents) **man-end**********************************************************************/ -int PDC_CDECL PDC_clearclipboard(void) +int PDC_clearclipboard(void) { PDC_LOG(("PDC_clearclipboard() - called\n"));