summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--array.h2
-rw-r--r--tty.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/array.h b/array.h
index 543c3dfe..59ac356f 100644
--- a/array.h
+++ b/array.h
@@ -47,7 +47,7 @@
} \
} while (0)
-#define ARRAY_EMPTY(a) ((a) == NULL || (a)->num == 0)
+#define ARRAY_EMPTY(a) (((void *) (a)) == NULL || (a)->num == 0)
#define ARRAY_LENGTH(a) ((a)->num)
#define ARRAY_DATA(a) ((a)->list)
diff --git a/tty.c b/tty.c
index 92ddf41f..4fe946af 100644
--- a/tty.c
+++ b/tty.c
@@ -1090,7 +1090,7 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
* Use HPA if change is larger than absolute, otherwise move
* the cursor with CUB/CUF.
*/
- if (abs(change) > cx && tty_term_has(term, TTYC_HPA)) {
+ if ((u_int) abs(change) > cx && tty_term_has(term, TTYC_HPA)) {
tty_putcode1(tty, TTYC_HPA, cx);
goto out;
} else if (change > 0 && tty_term_has(term, TTYC_CUB)) {
@@ -1126,7 +1126,7 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
* Try to use VPA if change is larger than absolute or if this
* change would cross the scroll region, otherwise use CUU/CUD.
*/
- if (abs(change) > cy ||
+ if ((u_int) abs(change) > cy ||
(change < 0 && cy - change > tty->rlower) ||
(change > 0 && cy - change < tty->rupper)) {
if (tty_term_has(term, TTYC_VPA)) {