Module Name: src
Committed By: uwe
Date: Sun Mar 15 01:12:47 UTC 2020
Modified Files:
src/lib/libcurses: curses_private.h
Log Message:
__NEED_ERASE - don't shadow __LDATA::attr with macro parameter name.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/lib/libcurses/curses_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.72 src/lib/libcurses/curses_private.h:1.73
--- src/lib/libcurses/curses_private.h:1.72 Fri Mar 13 02:57:26 2020
+++ src/lib/libcurses/curses_private.h Sun Mar 15 01:12:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_private.h,v 1.72 2020/03/13 02:57:26 roy Exp $ */
+/* $NetBSD: curses_private.h,v 1.73 2020/03/15 01:12:47 uwe Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -339,14 +339,14 @@ void __CTRACE(int, const char *, ...) _
/* Common erase logic */
#ifdef HAVE_WCHAR
-#define __NEED_ERASE(sp, bch, attr) \
- ((sp)->ch != (bch) || \
- ((sp)->attr & WA_ATTRIBUTES) != (attr) || \
- (sp)->nsp != NULL || \
- WCOL(*sp) < 0)
+#define __NEED_ERASE(_sp, _bch, _battr) \
+ ((_sp)->ch != (_bch) || \
+ ((_sp)->attr & WA_ATTRIBUTES) != (_battr) || \
+ (_sp)->nsp != NULL || \
+ WCOL(*_sp) < 0)
#else
-#define __NEED_ERASE(sp, bch, attr) \
- ((sp)->ch != (bch) || (sp)->attr != (attr))
+#define __NEED_ERASE(_sp, _bch, _battr) \
+ ((_sp)->ch != (_bch) || (_sp)->attr != (_battr))
#endif
/* Private functions. */
