X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fcurses.h.in;h=743ff98c2bf184d5cf2b8070322bf2967269f14c;hp=d487d4880e17dd1d091e2f1135784d72b40d049f;hb=0de8912c1c0746eb37b733e9e6fdf852aab9506a;hpb=cb4427a16794d98049b4d790b810d62217501f9f diff --git a/include/curses.h.in b/include/curses.h.in index d487d488..743ff98c 100644 --- a/include/curses.h.in +++ b/include/curses.h.in @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * + * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -32,7 +32,7 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: curses.h.in,v 1.263 2018/06/09 20:16:32 tom Exp $ */ +/* $Id: curses.h.in,v 1.264 2019/03/23 23:06:46 tom Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -891,12 +891,6 @@ extern NCURSES_EXPORT(char *) tparm_varargs (const char *, ...); /* special */ extern NCURSES_EXPORT(char *) tiparm (const char *, ...); /* special */ -/* - * X/Open says this returns a bool; SVr4 also checked for out-of-range line. - * The macro provides compatibility: - */ -#define is_linetouched(w,l) ((!(w) || ((l) > getmaxy(w)) || ((l) < 0)) ? ERR : (is_linetouched)((w),(l))) - /* * These functions are not in X/Open, but we use them in macro definitions: */ @@ -1432,6 +1426,12 @@ NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list); #endif #endif +/* + * X/Open says this returns a bool; SVr4 also checked for out-of-range line. + * The macro provides compatibility: + */ +#define is_linetouched(w,l) ((!(w) || ((l) > getmaxy(w)) || ((l) < 0)) ? ERR : (is_linetouched)((w),(l))) + #endif /* NCURSES_NOMACROS */ /*