Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7973
Modified Files:
array.h tty.c
Log Message:
Sync OpenBSD patchset 714:
Shut up gcc4 warnings.
Index: tty.c
===================================================================
RCS file: /cvsroot/tmux/tmux/tty.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- tty.c 6 Jun 2010 00:23:44 -0000 1.190
+++ tty.c 6 Jun 2010 00:27:08 -0000 1.191
@@ -1090,7 +1090,7 @@
* 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 @@
* 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)) {
Index: array.h
===================================================================
RCS file: /cvsroot/tmux/tmux/array.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- array.h 8 Feb 2010 18:29:32 -0000 1.10
+++ array.h 6 Jun 2010 00:27:08 -0000 1.11
@@ -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)
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
