diff options
224 files changed, 233 insertions, 137 deletions
diff --git a/curses/_curses.h b/curses/_curses.h index 94f312b..3ee0c23 100644 --- a/curses/_curses.h +++ b/curses/_curses.h @@ -1,6 +1,12 @@ #ifndef __NONSTD_CURSES_H__ #define __NONSTD_CURSES_H__ +#include <wctype.h> +#include <wchar.h> +#include <stdio.h> +#include <stdarg.h> +#include <curses.h> + struct __WINDOW { int y, x; }; @@ -42,6 +48,9 @@ _rt _fn(_t1 _a1) { return w##_fn(stdscr, _a1); } #define CURSES_WFN2(_rt, _fn, _t1, _t2) \ _rt _fn(_t1 _a1, _t2 _a2) { return w##_fn(stdscr, _a1, _a2); } +#define CURSES_WFN3(_rt, _fn, _t1, _t2, _t3) \ +_rt _fn(_t1 _a1, _t2 _a2, _t3 _a3) { return w##_fn(stdscr, _a1, _a2, _a3); } + #define CURSES_WFN8(_rt, _fn, _t1, _t2, _t3, _t4, _t5, _t6, _t7, _t8) \ _rt _fn(_t1 _a1, _t2 _a2, _t3 _a3, _t4 _a4, _t5 _a5, _t6 _a6, _t7 _a7, _t8 _a8) \ { return w##_fn(stdscr, _a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8); } diff --git a/curses/add_wch.c b/curses/add_wch.c index 40f4f1f..bf8f1e5 100644 --- a/curses/add_wch.c +++ b/curses/add_wch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wadd_wch(WINDOW * win, const cchar_t * wch) { diff --git a/curses/add_wchnstr.c b/curses/add_wchnstr.c index 99870cc..03742ac 100644 --- a/curses/add_wchnstr.c +++ b/curses/add_wchnstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wadd_wchnstr(WINDOW * win, const cchar_t * wchstr, int n) { diff --git a/curses/add_wchstr.c b/curses/add_wchstr.c index 4bf8f6a..2e710be 100644 --- a/curses/add_wchstr.c +++ b/curses/add_wchstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wadd_wchstr(WINDOW * win, const cchar_t * wchstr) { diff --git a/curses/addch.c b/curses/addch.c index 9f3f692..bc75f1f 100644 --- a/curses/addch.c +++ b/curses/addch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int waddch(WINDOW * win, const chtype ch) { diff --git a/curses/addchnstr.c b/curses/addchnstr.c index 11ecb7e..448b556 100644 --- a/curses/addchnstr.c +++ b/curses/addchnstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int waddchnstr(WINDOW * win, const chtype * chstr, int n) { diff --git a/curses/addchstr.c b/curses/addchstr.c index 0955b11..39cf96a 100644 --- a/curses/addchstr.c +++ b/curses/addchstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int waddchstr(WINDOW * win, const chtype * chstr) { diff --git a/curses/addnstr.c b/curses/addnstr.c index c0012cf..43c5d80 100644 --- a/curses/addnstr.c +++ b/curses/addnstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int waddnstr(WINDOW * win, const char * str, int n) { diff --git a/curses/addnwstr.c b/curses/addnwstr.c index 25e53a3..6fd81d5 100644 --- a/curses/addnwstr.c +++ b/curses/addnwstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int waddnwstr(WINDOW * win, const wchar_t * wstr, int n) { diff --git a/curses/addstr.c b/curses/addstr.c index e0f256d..bf6d022 100644 --- a/curses/addstr.c +++ b/curses/addstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int waddstr(WINDOW *win, const char * str) { diff --git a/curses/addwstr.c b/curses/addwstr.c index 18915f3..6c91e1e 100644 --- a/curses/addwstr.c +++ b/curses/addwstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int waddwstr(WINDOW * win, const wchar_t * wstr) { diff --git a/curses/attr_get.c b/curses/attr_get.c index 4acc227..84ac193 100644 --- a/curses/attr_get.c +++ b/curses/attr_get.c @@ -1,12 +1,12 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wattr_get(WINDOW * win, attr_t * attrs, short * color_pair_number, void * opts) { return ERR; } -CURSES_WFN2(int, attr_get, attr_t *, short *, void *) +CURSES_WFN3(int, attr_get, attr_t *, short *, void *) /* XOPEN(400) diff --git a/curses/attr_off.c b/curses/attr_off.c index 0402882..7df31f0 100644 --- a/curses/attr_off.c +++ b/curses/attr_off.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wattr_off(WINDOW * win, attr_t attrs, void * opts) { diff --git a/curses/attr_on.c b/curses/attr_on.c index 2e2f672..11d68f1 100644 --- a/curses/attr_on.c +++ b/curses/attr_on.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wattr_on(WINDOW * win, attr_t attrs, void * opts) { diff --git a/curses/attr_set.c b/curses/attr_set.c index 62e7802..65f3ce9 100644 --- a/curses/attr_set.c +++ b/curses/attr_set.c @@ -1,12 +1,12 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wattr_set(WINDOW * win, attr_t attrs, short color_pair_number, void * opts) { return ERR; } -CURSES_WFN2(int, attr_set, attr_t, short, void *) +CURSES_WFN3(int, attr_set, attr_t, short, void *) /* XOPEN(400) diff --git a/curses/attroff.c b/curses/attroff.c index d72268f..aca7f8c 100644 --- a/curses/attroff.c +++ b/curses/attroff.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wattroff(WINDOW * win, int attrs) { diff --git a/curses/attron.c b/curses/attron.c index 8d4b8fe..aefcfc3 100644 --- a/curses/attron.c +++ b/curses/attron.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wattron(WINDOW * win, int attrs) { diff --git a/curses/attrset.c b/curses/attrset.c index 4f66f24..a7844b5 100644 --- a/curses/attrset.c +++ b/curses/attrset.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wattrset(WINDOW * win, int attrs) { diff --git a/curses/baudrate.c b/curses/baudrate.c index 559e19a..4ba7915 100644 --- a/curses/baudrate.c +++ b/curses/baudrate.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int baudrate(void) diff --git a/curses/beep.c b/curses/beep.c index af0b8b3..3d9c7d2 100644 --- a/curses/beep.c +++ b/curses/beep.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int beep(void) diff --git a/curses/bkgd.c b/curses/bkgd.c index a55ea66..0b3aa5a 100644 --- a/curses/bkgd.c +++ b/curses/bkgd.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wbkgd(WINDOW * win, chtype ch) { diff --git a/curses/bkgdset.c b/curses/bkgdset.c index bdaf931..e91cc0f 100644 --- a/curses/bkgdset.c +++ b/curses/bkgdset.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> void wbkgdset(WINDOW * win, chtype ch) { diff --git a/curses/bkgrnd.c b/curses/bkgrnd.c index 3155f7b..4837215 100644 --- a/curses/bkgrnd.c +++ b/curses/bkgrnd.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wbkgrnd(WINDOW * win, const cchar_t * wch) { diff --git a/curses/bkgrndset.c b/curses/bkgrndset.c index e705a9f..afc6ed5 100644 --- a/curses/bkgrndset.c +++ b/curses/bkgrndset.c @@ -1,9 +1,9 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> void wbkgrndset(WINDOW * win, const cchar_t * wch) { - (void)win; (void)ch; + (void)win; (void)wch; } CURSES_VWFN1(bkgrndset, const cchar_t *) diff --git a/curses/bool.c b/curses/bool.h index c7927d0..c7927d0 100644 --- a/curses/bool.c +++ b/curses/bool.h diff --git a/curses/border.c b/curses/border.c index 6ee27e6..3783c02 100644 --- a/curses/border.c +++ b/curses/border.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wborder(WINDOW * win, chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, chtype bl, chtype br) { diff --git a/curses/border_set.c b/curses/border_set.c index 7fb267b..9f12b60 100644 --- a/curses/border_set.c +++ b/curses/border_set.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wborder_set(WINDOW * win, const cchar_t * ls, const cchar_t * rs, const cchar_t * ts, const cchar_t * bs, const cchar_t * tl, const cchar_t * tr, const cchar_t * bl, const cchar_t * br) { diff --git a/curses/box.c b/curses/box.c index f166e3b..204fb98 100644 --- a/curses/box.c +++ b/curses/box.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int box(WINDOW * win, chtype verch, chtype horch) diff --git a/curses/box_set.c b/curses/box_set.c index 3877fe9..deaf76c 100644 --- a/curses/box_set.c +++ b/curses/box_set.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/can_change_color.c b/curses/can_change_color.c index 13df296..ba69737 100644 --- a/curses/can_change_color.c +++ b/curses/can_change_color.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> bool can_change_color(void) diff --git a/curses/cbreak.c b/curses/cbreak.c index 8e2f6f9..be71b98 100644 --- a/curses/cbreak.c +++ b/curses/cbreak.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int cbreak(void) diff --git a/curses/chgat.c b/curses/chgat.c index 9a3398a..a48de6c 100644 --- a/curses/chgat.c +++ b/curses/chgat.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wchgat(WINDOW * win, int n, attr_t attr, short color, const void * opts) { diff --git a/curses/chtype.c b/curses/chtype.h index d56a0eb..d56a0eb 100644 --- a/curses/chtype.c +++ b/curses/chtype.h diff --git a/curses/clear.c b/curses/clear.c index 17bb04e..ae3997f 100644 --- a/curses/clear.c +++ b/curses/clear.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wclear(WINDOW * win) { diff --git a/curses/clearok.c b/curses/clearok.c index 317dba6..fc2df27 100644 --- a/curses/clearok.c +++ b/curses/clearok.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int clearok(WINDOW * win, bool bf) diff --git a/curses/clrtobot.c b/curses/clrtobot.c index 8381299..46b0ca1 100644 --- a/curses/clrtobot.c +++ b/curses/clrtobot.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wclrtobot(WINDOW * win) { diff --git a/curses/clrtoeol.c b/curses/clrtoeol.c index 189e9d6..90058f3 100644 --- a/curses/clrtoeol.c +++ b/curses/clrtoeol.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wclrtoeol(WINDOW * win) { diff --git a/curses/color_content.c b/curses/color_content.c index 7202527..f400760 100644 --- a/curses/color_content.c +++ b/curses/color_content.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int color_content(short color, short * red, short * green, short * blue) diff --git a/curses/color_set.c b/curses/color_set.c index 35f9465..e5023ea 100644 --- a/curses/color_set.c +++ b/curses/color_set.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wcolor_set(WINDOW * win, short color_pair_number, void * opts) { diff --git a/curses/copywin.c b/curses/copywin.c index 48134b8..4890be5 100644 --- a/curses/copywin.c +++ b/curses/copywin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int copywin(const WINDOW * srcwin, WINDOW * dstwin, int sminrow, int smincol, int dminrow, int dmincol, int dmaxrow, int dmaxcol, int overlay) diff --git a/curses/curs_set.c b/curses/curs_set.c index cbbfcf2..83e9fee 100644 --- a/curses/curs_set.c +++ b/curses/curs_set.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int curs_set(int visibility) diff --git a/curses/curscr.c b/curses/curscr.c index 04bc426..b64efe8 100644 --- a/curses/curscr.c +++ b/curses/curscr.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> SCREEN *curscr; /* diff --git a/curses/def_prog_mode.c b/curses/def_prog_mode.c index a96c122..1ffcb58 100644 --- a/curses/def_prog_mode.c +++ b/curses/def_prog_mode.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int def_prog_mode(void) diff --git a/curses/def_shell_mode.c b/curses/def_shell_mode.c index c9b1b78..4458cae 100644 --- a/curses/def_shell_mode.c +++ b/curses/def_shell_mode.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int def_shell_mode(void) diff --git a/curses/delay_output.c b/curses/delay_output.c index 3247f9c..0836cec 100644 --- a/curses/delay_output.c +++ b/curses/delay_output.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int delay_output(int ms) diff --git a/curses/delch.c b/curses/delch.c index 074852d..6edc51a 100644 --- a/curses/delch.c +++ b/curses/delch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wdelch(WINDOW * win) { diff --git a/curses/deleteln.c b/curses/deleteln.c index a18a3bf..4daef9b 100644 --- a/curses/deleteln.c +++ b/curses/deleteln.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wdeleteln(WINDOW * win) { diff --git a/curses/delscreen.c b/curses/delscreen.c index f57bff7..31230e8 100644 --- a/curses/delscreen.c +++ b/curses/delscreen.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void delscreen(SCREEN * sp) diff --git a/curses/delwin.c b/curses/delwin.c index 228463b..a5136b9 100644 --- a/curses/delwin.c +++ b/curses/delwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void delwin(WINDOW * win) diff --git a/curses/derwin.c b/curses/derwin.c index 1ce2b99..b960893 100644 --- a/curses/derwin.c +++ b/curses/derwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/doupdate.c b/curses/doupdate.c index dcefe63..d8b18af 100644 --- a/curses/doupdate.c +++ b/curses/doupdate.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int doupdate(void) diff --git a/curses/dupwin.c b/curses/dupwin.c index c5d1456..25acde5 100644 --- a/curses/dupwin.c +++ b/curses/dupwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/echo.c b/curses/echo.c index 0e840b5..35ffe1d 100644 --- a/curses/echo.c +++ b/curses/echo.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int echo(void) diff --git a/curses/echo_wchar.c b/curses/echo_wchar.c index 2f7686f..1b204be 100644 --- a/curses/echo_wchar.c +++ b/curses/echo_wchar.c @@ -1,12 +1,12 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wecho_wchar(WINDOW * win, const cchar_t * wch) { return ERR; } -CURSES_WFN1(int, echo_wchar, const cchar_t * wch) +CURSES_WFN1(int, echo_wchar, const cchar_t *) /* XOPEN(400) diff --git a/curses/echochar.c b/curses/echochar.c index a307743..aa158a8 100644 --- a/curses/echochar.c +++ b/curses/echochar.c @@ -1,12 +1,12 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wechochar(WINDOW * win, const chtype wch) { return ERR; } -CURSES_WFN1(int, echochar, const chtype wch) +CURSES_WFN1(int, echochar, const chtype) /* XOPEN(400) diff --git a/curses/endwin.c b/curses/endwin.c index 34bae0c..6ff6fb6 100644 --- a/curses/endwin.c +++ b/curses/endwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int endwin(void) diff --git a/curses/erase.c b/curses/erase.c index 7920533..c34d5cc 100644 --- a/curses/erase.c +++ b/curses/erase.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int werase(WINDOW * win) { diff --git a/curses/erasechar.c b/curses/erasechar.c index af888e1..2d9a661 100644 --- a/curses/erasechar.c +++ b/curses/erasechar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> char erasechar(void) diff --git a/curses/erasewchar.c b/curses/erasewchar.c index f65efe1..71c3981 100644 --- a/curses/erasewchar.c +++ b/curses/erasewchar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int erasewchar(wchar_t * ch) diff --git a/curses/filter.c b/curses/filter.c index c82b421..06fcf2c 100644 --- a/curses/filter.c +++ b/curses/filter.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void filter(void) diff --git a/curses/flash.c b/curses/flash.c index 1672d65..f59f8e8 100644 --- a/curses/flash.c +++ b/curses/flash.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int flash(void) diff --git a/curses/flushinp.c b/curses/flushinp.c index 5c95518..b0d0343 100644 --- a/curses/flushinp.c +++ b/curses/flushinp.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int flushinp(void) diff --git a/curses/get_wch.c b/curses/get_wch.c index c3c538f..d6ddb2b 100644 --- a/curses/get_wch.c +++ b/curses/get_wch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wget_wch(WINDOW * win, wint_t * ch) { diff --git a/curses/get_wstr.c b/curses/get_wstr.c index 67e6f71..f52d44c 100644 --- a/curses/get_wstr.c +++ b/curses/get_wstr.c @@ -1,6 +1,6 @@ -#include <curses.h> -#inlcude <limits.h> #include "_curses.h" +#include <curses.h> +#include <limits.h> int wget_wstr(WINDOW * win, wint_t * wstr) { diff --git a/curses/getbegyx.c b/curses/getbegyx.h index 47ccd28..47ccd28 100644 --- a/curses/getbegyx.c +++ b/curses/getbegyx.h diff --git a/curses/getbkgd.c b/curses/getbkgd.c index 3858406..c5782c2 100644 --- a/curses/getbkgd.c +++ b/curses/getbkgd.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> chtype getbkgd(WINDOW * win) diff --git a/curses/getbkgrnd.c b/curses/getbkgrnd.c index 5a3c8f5..d441656 100644 --- a/curses/getbkgrnd.c +++ b/curses/getbkgrnd.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> chtype wgetbkgrnd(WINDOW * win, cchar_t * wch) { diff --git a/curses/getcchar.c b/curses/getcchar.c index d95128d..0962069 100644 --- a/curses/getcchar.c +++ b/curses/getcchar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int getcchar(const cchar_t * wcval, wchar_t * wch, attr_t * attrs, short * color_pair, void * opts) diff --git a/curses/getch.c b/curses/getch.c index cc83d0a..b6d4a7d 100644 --- a/curses/getch.c +++ b/curses/getch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wgetch(WINDOW * win) { diff --git a/curses/getmaxyx.c b/curses/getmaxyx.h index ed1363f..ed1363f 100644 --- a/curses/getmaxyx.c +++ b/curses/getmaxyx.h diff --git a/curses/getn_wstr.c b/curses/getn_wstr.c index 08b584b..170fd0b 100644 --- a/curses/getn_wstr.c +++ b/curses/getn_wstr.c @@ -1,13 +1,13 @@ -#include <curses.h> -#inlcude <limits.h> #include "_curses.h" +#include <curses.h> +#include <limits.h> int wgetn_wstr(WINDOW * win, wint_t * wstr, int n) { return ERR; } -CURSES_FUNCTION(int, getn_wstr, wint_t *, int) +CURSES_FUNCTION2(int, getn_wstr, wint_t *, int) /* XOPEN(400) diff --git a/curses/getnstr.c b/curses/getnstr.c index 99bdc05..49a36ba 100644 --- a/curses/getnstr.c +++ b/curses/getnstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wgetnstr(WINDOW * win, char * str, int n) { diff --git a/curses/getparyx.c b/curses/getparyx.h index ce85037..ce85037 100644 --- a/curses/getparyx.c +++ b/curses/getparyx.h diff --git a/curses/getstr.c b/curses/getstr.c index f9dd98c..d09bfc6 100644 --- a/curses/getstr.c +++ b/curses/getstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wgetstr(WINDOW * win, char * str) { diff --git a/curses/getwin.c b/curses/getwin.c index 3c229b7..bd77155 100644 --- a/curses/getwin.c +++ b/curses/getwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdio.h> diff --git a/curses/getyx.c b/curses/getyx.h index 0a1e76d..0a1e76d 100644 --- a/curses/getyx.c +++ b/curses/getyx.h diff --git a/curses/halfdelay.c b/curses/halfdelay.c index 2ec3c04..7fd5533 100644 --- a/curses/halfdelay.c +++ b/curses/halfdelay.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int halfdelay(int tenths) diff --git a/curses/has_colors.c b/curses/has_colors.c index b0180d6..4e3f555 100644 --- a/curses/has_colors.c +++ b/curses/has_colors.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> bool has_colors(void) diff --git a/curses/has_ic.c b/curses/has_ic.c index f907f26..4d1fe2d 100644 --- a/curses/has_ic.c +++ b/curses/has_ic.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> bool has_ic(void) diff --git a/curses/has_il.c b/curses/has_il.c index dc4c961..e2f2b16 100644 --- a/curses/has_il.c +++ b/curses/has_il.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> bool has_il(void) diff --git a/curses/hline.c b/curses/hline.c index f584964..50d31e0 100644 --- a/curses/hline.c +++ b/curses/hline.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int whline(WINDOW * win, chtype ch, int n) { diff --git a/curses/hline_set.c b/curses/hline_set.c index 2492ab1..ba428c3 100644 --- a/curses/hline_set.c +++ b/curses/hline_set.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int whline_set(WINDOW * win, const cchar_t * wch, int n) { diff --git a/curses/idcok.c b/curses/idcok.c index 892785f..fbfe438 100644 --- a/curses/idcok.c +++ b/curses/idcok.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void idcok(WINDOW * win, bool bf) diff --git a/curses/idlok.c b/curses/idlok.c index db27c8f..34d8aec 100644 --- a/curses/idlok.c +++ b/curses/idlok.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int idlok(WINDOW * win, bool bf) diff --git a/curses/immedok.c b/curses/immedok.c index 383f974..b4798aa 100644 --- a/curses/immedok.c +++ b/curses/immedok.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void immedok(WINDOW * win, bool bf) diff --git a/curses/in_wch.c b/curses/in_wch.c index 9d095fb..1f021ef 100644 --- a/curses/in_wch.c +++ b/curses/in_wch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int win_wch(WINDOW * win, cchar_t * wcval) { diff --git a/curses/in_wchnstr.c b/curses/in_wchnstr.c index 337bf4a..2f9c276 100644 --- a/curses/in_wchnstr.c +++ b/curses/in_wchnstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int win_wchnstr(WINDOW * win, cchar_t * wcstr, int n) { diff --git a/curses/in_wchstr.c b/curses/in_wchstr.c index 4f81266..fae5c84 100644 --- a/curses/in_wchstr.c +++ b/curses/in_wchstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int win_wchstr(WINDOW * win, cchar_t * wcstr) { diff --git a/curses/inch.c b/curses/inch.c index 5e23dcc..fa242dd 100644 --- a/curses/inch.c +++ b/curses/inch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> chtype winch(WINDOW * win) { diff --git a/curses/inchnstr.c b/curses/inchnstr.c index a674041..b38def2 100644 --- a/curses/inchnstr.c +++ b/curses/inchnstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winchnstr(WINDOW * win, chtype * chstr, int n) { diff --git a/curses/inchstr.c b/curses/inchstr.c index a061c63..5932e73 100644 --- a/curses/inchstr.c +++ b/curses/inchstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winchstr(WINDOW * win, chtype * chstr) { diff --git a/curses/init_color.c b/curses/init_color.c index 5d1c727..3e8930d 100644 --- a/curses/init_color.c +++ b/curses/init_color.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int init_color(short color, short red, short green, short blue) diff --git a/curses/init_pair.c b/curses/init_pair.c index 84537d1..f868375 100644 --- a/curses/init_pair.c +++ b/curses/init_pair.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int init_pair(short pai, short f, short b) diff --git a/curses/initscr.c b/curses/initscr.c index 884d31f..3c21a90 100644 --- a/curses/initscr.c +++ b/curses/initscr.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdio.h> #include <stdlib.h> diff --git a/curses/innstr.c b/curses/innstr.c index aada853..66db75b 100644 --- a/curses/innstr.c +++ b/curses/innstr.c @@ -1,12 +1,12 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winnstr(WINDOW * win, char * str, int n) { return ERR; } -CURSES_FUNCTION2(int, innstr, char *, int n) +CURSES_FUNCTION2(int, innstr, char *, int) /* XOPEN(400) diff --git a/curses/innwstr.c b/curses/innwstr.c index 3518b6c..77b692c 100644 --- a/curses/innwstr.c +++ b/curses/innwstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winnwstr(WINDOW * win, wchar_t * wstr, int n) { diff --git a/curses/ins_nwstr.c b/curses/ins_nwstr.c index 276106d..d57ac26 100644 --- a/curses/ins_nwstr.c +++ b/curses/ins_nwstr.c @@ -1,7 +1,7 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> -int ins_nwstr(WINDOW * win, const wchar_t * wstr, int n) +int wins_nwstr(WINDOW * win, const wchar_t * wstr, int n) { return ERR; } diff --git a/curses/ins_wch.c b/curses/ins_wch.c index 0f295c1..d16a982 100644 --- a/curses/ins_wch.c +++ b/curses/ins_wch.c @@ -1,7 +1,7 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> -int ins_wch(WINDOW * win, const cchar_t * wch) +int wins_wch(WINDOW * win, const cchar_t * wch) { return ERR; } diff --git a/curses/ins_wstr.c b/curses/ins_wstr.c index 5668eb9..bd230e8 100644 --- a/curses/ins_wstr.c +++ b/curses/ins_wstr.c @@ -1,7 +1,7 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> -int ins_wstr(WINDOW * win, const wchar_t * wstr) +int wins_wstr(WINDOW * win, const wchar_t * wstr) { return ERR; } diff --git a/curses/insch.c b/curses/insch.c index 8461d1c..afaaf2a 100644 --- a/curses/insch.c +++ b/curses/insch.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winsch(WINDOW * win, chtype ch) { diff --git a/curses/insdelln.c b/curses/insdelln.c index 2a0bddc..91da541 100644 --- a/curses/insdelln.c +++ b/curses/insdelln.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winsdelln(WINDOW * win, int n) { diff --git a/curses/insertln.c b/curses/insertln.c index fbc3dd0..34d441f 100644 --- a/curses/insertln.c +++ b/curses/insertln.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winsertln(WINDOW * win) { diff --git a/curses/insnstr.c b/curses/insnstr.c index 5460135..4bcbada 100644 --- a/curses/insnstr.c +++ b/curses/insnstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winsnstr(WINDOW * win, const char * str, int n) { diff --git a/curses/insstr.c b/curses/insstr.c index 9253d6f..101a9af 100644 --- a/curses/insstr.c +++ b/curses/insstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winsstr(WINDOW * win, const char * str) { diff --git a/curses/instr.c b/curses/instr.c index 62b3826..3e8ea4e 100644 --- a/curses/instr.c +++ b/curses/instr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winstr(WINDOW * win, char * str) { diff --git a/curses/intrflush.c b/curses/intrflush.c index 8ea6ca4..d09e061 100644 --- a/curses/intrflush.c +++ b/curses/intrflush.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int intrflush(WINDOW * win, bool bf) diff --git a/curses/inwstr.c b/curses/inwstr.c index 5128093..0958768 100644 --- a/curses/inwstr.c +++ b/curses/inwstr.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int winwstr(WINDOW * win, wchar_t * wstr) { diff --git a/curses/is_linetouched.c b/curses/is_linetouched.c index b744642..990685c 100644 --- a/curses/is_linetouched.c +++ b/curses/is_linetouched.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> bool is_linetouched(WINDOW * win, int line) diff --git a/curses/is_wintouched.c b/curses/is_wintouched.c index 28ede26..a144255 100644 --- a/curses/is_wintouched.c +++ b/curses/is_wintouched.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> bool is_wintouched(WINDOW * win) diff --git a/curses/isendwin.c b/curses/isendwin.c index d4b717c..832d6aa 100644 --- a/curses/isendwin.c +++ b/curses/isendwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> bool isendwin(void) diff --git a/curses/key_name.c b/curses/key_name.c index e11641d..92fa302 100644 --- a/curses/key_name.c +++ b/curses/key_name.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/keyname.c b/curses/keyname.c index 9b20175..fbd0ddb 100644 --- a/curses/keyname.c +++ b/curses/keyname.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/keypad.c b/curses/keypad.c index 56daeb5..99428c3 100644 --- a/curses/keypad.c +++ b/curses/keypad.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int keypad(WINDOW * win, bool bf) diff --git a/curses/killchar.c b/curses/killchar.c index c0de4a0..547fdff 100644 --- a/curses/killchar.c +++ b/curses/killchar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> char killchar(void) diff --git a/curses/killwchar.c b/curses/killwchar.c index c47b80f..0ee3f94 100644 --- a/curses/killwchar.c +++ b/curses/killwchar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int killwchar(wchar_t * ch) diff --git a/curses/leaveok.c b/curses/leaveok.c index ebcc44d..3f0320b 100644 --- a/curses/leaveok.c +++ b/curses/leaveok.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int leaveok(WINDOW * win, bool bf) diff --git a/curses/longname.c b/curses/longname.c index 8d47594..3761a25 100644 --- a/curses/longname.c +++ b/curses/longname.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> char * longname(void) diff --git a/curses/meta.c b/curses/meta.c index 0d61ed3..f43e6cf 100644 --- a/curses/meta.c +++ b/curses/meta.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/move.c b/curses/move.c index 59d1699..98fb883 100644 --- a/curses/move.c +++ b/curses/move.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wmove(WINDOW * win, int y, int x) { diff --git a/curses/mvcur.c b/curses/mvcur.c index a4e02bb..d375db9 100644 --- a/curses/mvcur.c +++ b/curses/mvcur.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int mvcur(int oldrow, int oldcol, int newrow, int newcol) diff --git a/curses/mvderwin.c b/curses/mvderwin.c index cbea58a..ff366da 100644 --- a/curses/mvderwin.c +++ b/curses/mvderwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/mvprintw.c b/curses/mvprintw.c index d0b9bfb..b49e083 100644 --- a/curses/mvprintw.c +++ b/curses/mvprintw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/mvscanw.c b/curses/mvscanw.c index d7849d3..380472a 100644 --- a/curses/mvscanw.c +++ b/curses/mvscanw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/mvwin.c b/curses/mvwin.c index 92f6823..d1b0a9c 100644 --- a/curses/mvwin.c +++ b/curses/mvwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int mvwin(WINDOW * win, int y, int x) diff --git a/curses/mvwprintw.c b/curses/mvwprintw.c index e4b6e20..5033f43 100644 --- a/curses/mvwprintw.c +++ b/curses/mvwprintw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/mvwscanw.c b/curses/mvwscanw.c index a5ae33b..e68a1bc 100644 --- a/curses/mvwscanw.c +++ b/curses/mvwscanw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/napms.c b/curses/napms.c index e5a582e..52c26f7 100644 --- a/curses/napms.c +++ b/curses/napms.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int napms(int ms) diff --git a/curses/newpad.c b/curses/newpad.c index 498f91b..d165f63 100644 --- a/curses/newpad.c +++ b/curses/newpad.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> WINDOW * newpad(int nlines, int ncols) diff --git a/curses/newterm.c b/curses/newterm.c index fd979df..f40a518 100644 --- a/curses/newterm.c +++ b/curses/newterm.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/newwin.c b/curses/newwin.c index f6628c3..bf43cfd 100644 --- a/curses/newwin.c +++ b/curses/newwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/nl.c b/curses/nl.c index aed9b8b..f3a2c60 100644 --- a/curses/nl.c +++ b/curses/nl.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int nl(void) diff --git a/curses/nocbreak.c b/curses/nocbreak.c index 4584043..d446667 100644 --- a/curses/nocbreak.c +++ b/curses/nocbreak.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int nocbreak(void) diff --git a/curses/nodelay.c b/curses/nodelay.c index 52121a3..d851458 100644 --- a/curses/nodelay.c +++ b/curses/nodelay.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int nodelay(WINDOW * win, bool bf) diff --git a/curses/noecho.c b/curses/noecho.c index 7239307..8bf2115 100644 --- a/curses/noecho.c +++ b/curses/noecho.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int noecho(void) diff --git a/curses/nonl.c b/curses/nonl.c index 84dcb87..26b9130 100644 --- a/curses/nonl.c +++ b/curses/nonl.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int nonl(void) diff --git a/curses/noqiflush.c b/curses/noqiflush.c index 8ab5979..5081d9a 100644 --- a/curses/noqiflush.c +++ b/curses/noqiflush.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void noqiflush(void) diff --git a/curses/noraw.c b/curses/noraw.c index ef29342..4523a76 100644 --- a/curses/noraw.c +++ b/curses/noraw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int noraw(void) diff --git a/curses/notimeout.c b/curses/notimeout.c index d968293..866baff 100644 --- a/curses/notimeout.c +++ b/curses/notimeout.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int notimeout(WINDOW * win, bool bf) diff --git a/curses/overlay.c b/curses/overlay.c index 471e9ba..e938909 100644 --- a/curses/overlay.c +++ b/curses/overlay.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int overlay(const WINDOW * srcwin, WINDOW * dstwin) diff --git a/curses/overwrite.c b/curses/overwrite.c index a0bce56..8f14459 100644 --- a/curses/overwrite.c +++ b/curses/overwrite.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int overwrite(const WINDOW * srcwin, WINDOW * dstwin) diff --git a/curses/pair_content.c b/curses/pair_content.c index 7853bce..f7af1b5 100644 --- a/curses/pair_content.c +++ b/curses/pair_content.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int pair_content(short pair, short * f, short * b) diff --git a/curses/pecho_wchar.c b/curses/pecho_wchar.c index 416be86..18d2ddb 100644 --- a/curses/pecho_wchar.c +++ b/curses/pecho_wchar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int pecho_wchar(WINDOW * pad, const cchar_t * wch) diff --git a/curses/pechochar.c b/curses/pechochar.c index 3fcea5d..22cbb9e 100644 --- a/curses/pechochar.c +++ b/curses/pechochar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int pechochar(WINDOW * pad, chtype ch) diff --git a/curses/pnoutrefresh.c b/curses/pnoutrefresh.c index f029deb..06c3fe5 100644 --- a/curses/pnoutrefresh.c +++ b/curses/pnoutrefresh.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int pnoutrefresh(WINDOW * pad, int pminrow, int pmincol, int sminrow, int smincol, int smaxrow, int smaxcol) diff --git a/curses/prefresh.c b/curses/prefresh.c index 21fbffa..c9213e6 100644 --- a/curses/prefresh.c +++ b/curses/prefresh.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int prefresh(WINDOW * pad, int pminrow, int pmincol, int sminrow, int smincol, int smaxrow, int smaxcol) diff --git a/curses/printw.c b/curses/printw.c index 836e4b0..8e2bbaf 100644 --- a/curses/printw.c +++ b/curses/printw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/putwin.c b/curses/putwin.c index 67d28fc..10607f8 100644 --- a/curses/putwin.c +++ b/curses/putwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdio.h> diff --git a/curses/qiflush.c b/curses/qiflush.c index 41b6c78..485b947 100644 --- a/curses/qiflush.c +++ b/curses/qiflush.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void qiflush(void) diff --git a/curses/raw.c b/curses/raw.c index d68d661..2b3c6e8 100644 --- a/curses/raw.c +++ b/curses/raw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int raw(void) diff --git a/curses/redrawwin.c b/curses/redrawwin.c index bf33ebe..2dcc5bc 100644 --- a/curses/redrawwin.c +++ b/curses/redrawwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int redrawwin(WINDOW * win) diff --git a/curses/refresh.c b/curses/refresh.c index d25e509..d8f52a9 100644 --- a/curses/refresh.c +++ b/curses/refresh.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wrefresh(WINDOW * win) { diff --git a/curses/reset_prog_mode.c b/curses/reset_prog_mode.c index 1a3d34e..08a9fb2 100644 --- a/curses/reset_prog_mode.c +++ b/curses/reset_prog_mode.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int reset_prog_mode(void) diff --git a/curses/reset_shell_mode.c b/curses/reset_shell_mode.c index 81db6a4..7e9c3b1 100644 --- a/curses/reset_shell_mode.c +++ b/curses/reset_shell_mode.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int reset_shell_mode(void) diff --git a/curses/resetty.c b/curses/resetty.c index 7211eb8..8a7aa46 100644 --- a/curses/resetty.c +++ b/curses/resetty.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int resetty(void) diff --git a/curses/ripoffline.c b/curses/ripoffline.c index cf5f32c..484f1a0 100644 --- a/curses/ripoffline.c +++ b/curses/ripoffline.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int ripoffline(int line, int (*init)(WINDOW * win, int columns)) diff --git a/curses/savetty.c b/curses/savetty.c index 54755ba..0163e58 100644 --- a/curses/savetty.c +++ b/curses/savetty.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int savetty(void) diff --git a/curses/scanw.c b/curses/scanw.c index f6cb88e..e090dfb 100644 --- a/curses/scanw.c +++ b/curses/scanw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/scr_dump.c b/curses/scr_dump.c index 2b6acf5..c799100 100644 --- a/curses/scr_dump.c +++ b/curses/scr_dump.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int scr_dump(const char * filename) diff --git a/curses/scr_init.c b/curses/scr_init.c index 846f92a..7c52b30 100644 --- a/curses/scr_init.c +++ b/curses/scr_init.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int scr_init(const char * filename) diff --git a/curses/scr_restore.c b/curses/scr_restore.c index b2f7916..df5ffef 100644 --- a/curses/scr_restore.c +++ b/curses/scr_restore.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int scr_restore(const char * filename) diff --git a/curses/scr_set.c b/curses/scr_set.c index 0cf4da9..2e12a85 100644 --- a/curses/scr_set.c +++ b/curses/scr_set.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int scr_set(const char * filename) diff --git a/curses/scrl.c b/curses/scrl.c index 3caf42a..270af54 100644 --- a/curses/scrl.c +++ b/curses/scrl.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wscrl(WINDOW * win, int n) { diff --git a/curses/scrollok.c b/curses/scrollok.c index 2c49295..0ad0dd8 100644 --- a/curses/scrollok.c +++ b/curses/scrollok.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int scrollok(WINDOW * win, bool bf) diff --git a/curses/set_term.c b/curses/set_term.c index f7b4609..f630182 100644 --- a/curses/set_term.c +++ b/curses/set_term.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> SCREEN * set_term(SCREEN * new) diff --git a/curses/setcchar.c b/curses/setcchar.c index 0697872..dd7771a 100644 --- a/curses/setcchar.c +++ b/curses/setcchar.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs, short color_pair, const void * opts) diff --git a/curses/setscrreg.c b/curses/setscrreg.c index c7eb053..5ae3004 100644 --- a/curses/setscrreg.c +++ b/curses/setscrreg.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wsetscrreg(WINDOW * win, int top, int bot) { diff --git a/curses/slk_attr_off.c b/curses/slk_attr_off.c index ad9ec4f..056b754 100644 --- a/curses/slk_attr_off.c +++ b/curses/slk_attr_off.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_attr_off(const chtype attrs, void * opts) diff --git a/curses/slk_attr_on.c b/curses/slk_attr_on.c index 33fc652..a487422 100644 --- a/curses/slk_attr_on.c +++ b/curses/slk_attr_on.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_attr_on(const chtype attrs, void * opts) diff --git a/curses/slk_attr_set.c b/curses/slk_attr_set.c index b9ecfe5..b39e385 100644 --- a/curses/slk_attr_set.c +++ b/curses/slk_attr_set.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_attr_set(const chtype attrs, short color_pair_number, void * opts) diff --git a/curses/slk_attroff.c b/curses/slk_attroff.c index 378314e..44e6dd9 100644 --- a/curses/slk_attroff.c +++ b/curses/slk_attroff.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_attroff(const chtype attrs) diff --git a/curses/slk_attron.c b/curses/slk_attron.c index 4708d20..591b02e 100644 --- a/curses/slk_attron.c +++ b/curses/slk_attron.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_attron(const chtype attrs) diff --git a/curses/slk_attrset.c b/curses/slk_attrset.c index 55302b4..70871a9 100644 --- a/curses/slk_attrset.c +++ b/curses/slk_attrset.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_attrset(const chtype attrs) diff --git a/curses/slk_clear.c b/curses/slk_clear.c index cb50889..e7d47a6 100644 --- a/curses/slk_clear.c +++ b/curses/slk_clear.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_clear(void) diff --git a/curses/slk_color.c b/curses/slk_color.c index 8b737b8..8bbb1ee 100644 --- a/curses/slk_color.c +++ b/curses/slk_color.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_color(short color_pair_number) diff --git a/curses/slk_init.c b/curses/slk_init.c index 3511b62..1f72acf 100644 --- a/curses/slk_init.c +++ b/curses/slk_init.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_init(int fmt) diff --git a/curses/slk_label.c b/curses/slk_label.c index ea8b7f4..17084ab 100644 --- a/curses/slk_label.c +++ b/curses/slk_label.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/slk_noutrefresh.c b/curses/slk_noutrefresh.c index 31e551c..51c148d 100644 --- a/curses/slk_noutrefresh.c +++ b/curses/slk_noutrefresh.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_noutrefresh(void) diff --git a/curses/slk_refresh.c b/curses/slk_refresh.c index 8be8285..37c8ff5 100644 --- a/curses/slk_refresh.c +++ b/curses/slk_refresh.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_refresh(void) diff --git a/curses/slk_restore.c b/curses/slk_restore.c index 70b5d13..03dca99 100644 --- a/curses/slk_restore.c +++ b/curses/slk_restore.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_restore(void) diff --git a/curses/slk_set.c b/curses/slk_set.c index 85bf631..44b6acd 100644 --- a/curses/slk_set.c +++ b/curses/slk_set.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_set(int labnum, const char * label, int justify) diff --git a/curses/slk_touch.c b/curses/slk_touch.c index d24de7c..4d16bcf 100644 --- a/curses/slk_touch.c +++ b/curses/slk_touch.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_touch(void) diff --git a/curses/slk_wset.c b/curses/slk_wset.c index 9029b09..52d4ab4 100644 --- a/curses/slk_wset.c +++ b/curses/slk_wset.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int slk_wset(int labnum, const wchar_t * label, int justify) diff --git a/curses/standend.c b/curses/standend.c index 640a965..0950616 100644 --- a/curses/standend.c +++ b/curses/standend.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wstandend(WINDOW * win) { diff --git a/curses/standout.c b/curses/standout.c index 121ee02..90504e9 100644 --- a/curses/standout.c +++ b/curses/standout.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wstandout(WINDOW * win) { diff --git a/curses/start_color.c b/curses/start_color.c index 6e160b6..e147c10 100644 --- a/curses/start_color.c +++ b/curses/start_color.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int start_color(void) diff --git a/curses/stdscr.c b/curses/stdscr.c index a3aef95..749f26e 100644 --- a/curses/stdscr.c +++ b/curses/stdscr.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> WINDOW *stdscr; /* diff --git a/curses/subpad.c b/curses/subpad.c index 32da730..165db8d 100644 --- a/curses/subpad.c +++ b/curses/subpad.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> WINDOW * subpad(WINDOW * orig, int nlines, int ncols, int begin_y, int begin_x) diff --git a/curses/subwin.c b/curses/subwin.c index 5092bef..ad177b0 100644 --- a/curses/subwin.c +++ b/curses/subwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/syncok.c b/curses/syncok.c index ec66338..c1ebbc7 100644 --- a/curses/syncok.c +++ b/curses/syncok.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int syncok(WINDOW * win, bool bf) diff --git a/curses/term_attrs.c b/curses/term_attrs.c index 9f3ca16..fca690a 100644 --- a/curses/term_attrs.c +++ b/curses/term_attrs.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> attr_t terma_ttrs(void) diff --git a/curses/termattrs.c b/curses/termattrs.c index 52db3c3..dd12a92 100644 --- a/curses/termattrs.c +++ b/curses/termattrs.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> chtype termattrs(void) diff --git a/curses/termname.c b/curses/termname.c index 232114b..9b9cc96 100644 --- a/curses/termname.c +++ b/curses/termname.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stddef.h> diff --git a/curses/timeout.c b/curses/timeout.c index 4553541..ea71c2b 100644 --- a/curses/timeout.c +++ b/curses/timeout.c @@ -1,7 +1,7 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> -void wtimeout(int delay) +void wtimeout(WINDOW *win, int delay) { } diff --git a/curses/touchline.c b/curses/touchline.c index 2ba36c4..8bc3c9a 100644 --- a/curses/touchline.c +++ b/curses/touchline.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int touchline(WINDOW * win, int start, int count) diff --git a/curses/touchwin.c b/curses/touchwin.c index 24e46e8..1afecfa 100644 --- a/curses/touchwin.c +++ b/curses/touchwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int touchwin(WINDOW * win) diff --git a/curses/typeahead.c b/curses/typeahead.c index f010b66..5996aa1 100644 --- a/curses/typeahead.c +++ b/curses/typeahead.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int typeahead(int fildes) diff --git a/curses/unget_wch.c b/curses/unget_wch.c index 9837bfa..2c90dac 100644 --- a/curses/unget_wch.c +++ b/curses/unget_wch.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int unget_wch(const wchar_t wch) diff --git a/curses/ungetch.c b/curses/ungetch.c index cb6a41c..058a0d4 100644 --- a/curses/ungetch.c +++ b/curses/ungetch.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int ungetch(int ch) diff --git a/curses/untouchwin.c b/curses/untouchwin.c index 1e9c101..fad49d5 100644 --- a/curses/untouchwin.c +++ b/curses/untouchwin.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int untouchwin(WINDOW * win) diff --git a/curses/use_env.c b/curses/use_env.c index d335872..a29b798 100644 --- a/curses/use_env.c +++ b/curses/use_env.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void use_env(bool boolval) diff --git a/curses/vid_attr.c b/curses/vid_attr.c index 54ad8df..8efea0e 100644 --- a/curses/vid_attr.c +++ b/curses/vid_attr.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int vid_ttr(attr_t attr, short color_pair_number, void * opt) diff --git a/curses/vid_puts.c b/curses/vid_puts.c index df2643c..47a148d 100644 --- a/curses/vid_puts.c +++ b/curses/vid_puts.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int vid_puts(attr_t attr, short color_pair_number, void * opt, int (*putfunc)(int)) diff --git a/curses/vidattr.c b/curses/vidattr.c index d0ac642..72e852e 100644 --- a/curses/vidattr.c +++ b/curses/vidattr.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int vidattr(chtype attr) diff --git a/curses/vidputs.c b/curses/vidputs.c index 33b4e44..f697bbf 100644 --- a/curses/vidputs.c +++ b/curses/vidputs.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int vidputs(chtype attr, int (*putfunc)(int)) diff --git a/curses/vline.c b/curses/vline.c index 0bc7567..59c7eff 100644 --- a/curses/vline.c +++ b/curses/vline.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wvline(WINDOW * win, chtype ch, int n) { diff --git a/curses/vline_set.c b/curses/vline_set.c index 0e5a1ec..ec165ef 100644 --- a/curses/vline_set.c +++ b/curses/vline_set.c @@ -1,5 +1,5 @@ -#include <curses.h> #include "_curses.h" +#include <curses.h> int wvline_set(WINDOW * win, const cchar_t * wch, int n) { diff --git a/curses/vw_printw.c b/curses/vw_printw.c index b247dd9..104a1a2 100644 --- a/curses/vw_printw.c +++ b/curses/vw_printw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/vw_scanw.c b/curses/vw_scanw.c index 33ec0a3..426b03a 100644 --- a/curses/vw_scanw.c +++ b/curses/vw_scanw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/wcursyncup.c b/curses/wcursyncup.c index 8cb7d98..d68bebc 100644 --- a/curses/wcursyncup.c +++ b/curses/wcursyncup.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void wcursyncup(WINDOW * win) diff --git a/curses/wnoutrefresh.c b/curses/wnoutrefresh.c index 5eb2b71..b65ba32 100644 --- a/curses/wnoutrefresh.c +++ b/curses/wnoutrefresh.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int wnoutrefresh(WINDOW * win) diff --git a/curses/wprintw.c b/curses/wprintw.c index 77b7eff..87d2d85 100644 --- a/curses/wprintw.c +++ b/curses/wprintw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/wredrawln.c b/curses/wredrawln.c index 3293c4f..72f5707 100644 --- a/curses/wredrawln.c +++ b/curses/wredrawln.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> int wredrawln(WINDOW * win, int beg_line, int num_lines) diff --git a/curses/wscanw.c b/curses/wscanw.c index cbbfeaf..73d8298 100644 --- a/curses/wscanw.c +++ b/curses/wscanw.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> #include <stdarg.h> diff --git a/curses/wsyncdown.c b/curses/wsyncdown.c index 6027ed9..0523e69 100644 --- a/curses/wsyncdown.c +++ b/curses/wsyncdown.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void wsyncdown(WINDOW * win) diff --git a/curses/wsyncup.c b/curses/wsyncup.c index db7a446..917f5ba 100644 --- a/curses/wsyncup.c +++ b/curses/wsyncup.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> void wsyncup(WINDOW * win) diff --git a/curses/wtouchln.c b/curses/wtouchln.c index b521d05..df3dcb0 100644 --- a/curses/wtouchln.c +++ b/curses/wtouchln.c @@ -1,8 +1,9 @@ +#include "_curses.h" #include <curses.h> int wtouchln(WINDOW * win, int y, int x, int changed) { - return ERR + return ERR; } /* diff --git a/curses/wunctrl.c b/curses/wunctrl.c index 352e0a3..4df7fa1 100644 --- a/curses/wunctrl.c +++ b/curses/wunctrl.c @@ -1,3 +1,4 @@ +#include "_curses.h" #include <curses.h> wchar_t * wunctrl(cchar_t * wc) diff --git a/mk/bool.d b/mk/bool.d deleted file mode 100644 index 3249555..0000000 --- a/mk/bool.d +++ /dev/null @@ -1,8 +0,0 @@ -libcurses.a: libcurses.a(bool.o) -libcurses.a(bool.o): $(OBJDIR)/bool.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/bool.o: curses/bool.c - @echo "[CC] $@" - @mkdir -p "$(@D)" - @$(CC) -c -o $@ $(CFLAGS) curses/bool.c diff --git a/mk/chtype.d b/mk/chtype.d deleted file mode 100644 index ca75974..0000000 --- a/mk/chtype.d +++ /dev/null @@ -1,8 +0,0 @@ -libcurses.a: libcurses.a(chtype.o) -libcurses.a(chtype.o): $(OBJDIR)/chtype.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/chtype.o: curses/chtype.c - @echo "[CC] $@" - @mkdir -p "$(@D)" - @$(CC) -c -o $@ $(CFLAGS) curses/chtype.c @@ -21,7 +21,6 @@ include mk/bkgd.d include mk/bkgdset.d include mk/bkgrnd.d include mk/bkgrndset.d -include mk/bool.d include mk/border.d include mk/border_set.d include mk/box.d @@ -29,7 +28,6 @@ include mk/box_set.d include mk/can_change_color.d include mk/cbreak.d include mk/chgat.d -include mk/chtype.d include mk/clear.d include mk/clearok.d include mk/clrtobot.d @@ -61,18 +59,14 @@ include mk/flash.d include mk/flushinp.d include mk/get_wch.d include mk/get_wstr.d -include mk/getbegyx.d include mk/getbkgd.d include mk/getbkgrnd.d include mk/getcchar.d include mk/getch.d -include mk/getmaxyx.d include mk/getn_wstr.d include mk/getnstr.d -include mk/getparyx.d include mk/getstr.d include mk/getwin.d -include mk/getyx.d include mk/halfdelay.d include mk/has_colors.d include mk/has_ic.d diff --git a/mk/getbegyx.d b/mk/getbegyx.d deleted file mode 100644 index 22ba3ff..0000000 --- a/mk/getbegyx.d +++ /dev/null @@ -1,8 +0,0 @@ -libcurses.a: libcurses.a(getbegyx.o) -libcurses.a(getbegyx.o): $(OBJDIR)/getbegyx.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/getbegyx.o: curses/getbegyx.c - @echo "[CC] $@" - @mkdir -p "$(@D)" - @$(CC) -c -o $@ $(CFLAGS) curses/getbegyx.c diff --git a/mk/getmaxyx.d b/mk/getmaxyx.d deleted file mode 100644 index 817e2c3..0000000 --- a/mk/getmaxyx.d +++ /dev/null @@ -1,8 +0,0 @@ -libcurses.a: libcurses.a(getmaxyx.o) -libcurses.a(getmaxyx.o): $(OBJDIR)/getmaxyx.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/getmaxyx.o: curses/getmaxyx.c - @echo "[CC] $@" - @mkdir -p "$(@D)" - @$(CC) -c -o $@ $(CFLAGS) curses/getmaxyx.c diff --git a/mk/getparyx.d b/mk/getparyx.d deleted file mode 100644 index cfb8909..0000000 --- a/mk/getparyx.d +++ /dev/null @@ -1,8 +0,0 @@ -libcurses.a: libcurses.a(getparyx.o) -libcurses.a(getparyx.o): $(OBJDIR)/getparyx.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/getparyx.o: curses/getparyx.c - @echo "[CC] $@" - @mkdir -p "$(@D)" - @$(CC) -c -o $@ $(CFLAGS) curses/getparyx.c diff --git a/mk/getyx.d b/mk/getyx.d deleted file mode 100644 index d2e7ff7..0000000 --- a/mk/getyx.d +++ /dev/null @@ -1,8 +0,0 @@ -libcurses.a: libcurses.a(getyx.o) -libcurses.a(getyx.o): $(OBJDIR)/getyx.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/getyx.o: curses/getyx.c - @echo "[CC] $@" - @mkdir -p "$(@D)" - @$(CC) -c -o $@ $(CFLAGS) curses/getyx.c |