X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=f619c5c967e5bcb4fed445108e1165febd737066;hp=1d51a85f72dcbfa27c54b25549848488d9ec8d19;hb=d76c9bfec68e0efa6e1b8e95b32b66caf25cfc12;hpb=fe43d506ce08d1deef9e9e5a6d5fd4f9c9c32e1d diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 1d51a85f..f619c5c9 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.624 2019/06/23 15:20:49 tom Exp $ + * $Id: curses.priv.h,v 1.625 2019/07/28 18:32:05 tom Exp $ * * curses.priv.h * @@ -2178,18 +2178,20 @@ extern NCURSES_EXPORT(int) _nc_ripoffline(int, int(*)(WINDOW*, int)); #define SETUP_FAIL ERR -#define ret_error(code, fmt, arg) if (errret) {\ - *errret = code;\ +#define ret_error(rc, fmt, p, q) if (errret) {\ + *errret = rc;\ + q;\ returnCode(SETUP_FAIL);\ } else {\ - fprintf(stderr, fmt, arg);\ + fprintf(stderr, fmt, p);\ + q;\ ExitTerminfo(EXIT_FAILURE);\ } -#define ret_error1(code, fmt, arg) ret_error(code, "'%s': " fmt, arg) +#define ret_error1(rc, fmt, p, q) ret_error(rc, "'%s': " fmt, p, q) -#define ret_error0(code, msg) if (errret) {\ - *errret = code;\ +#define ret_error0(rc, msg) if (errret) {\ + *errret = rc;\ returnCode(SETUP_FAIL);\ } else {\ fprintf(stderr, msg);\