From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- krfb/libvncserver/tight.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'krfb/libvncserver/tight.c') diff --git a/krfb/libvncserver/tight.c b/krfb/libvncserver/tight.c index 9dd743ac..bef8f825 100644 --- a/krfb/libvncserver/tight.c +++ b/krfb/libvncserver/tight.c @@ -1239,7 +1239,7 @@ EncodeMonoRect##bpp(buf, w, h) \ { \ CARD##bpp *ptr; \ CARD##bpp bg; \ - unsigned int value, mask; \ + unsigned int value, tqmask; \ int aligned_width; \ int x, y, bg_bits; \ \ @@ -1257,27 +1257,27 @@ EncodeMonoRect##bpp(buf, w, h) \ *buf++ = 0; \ continue; \ } \ - mask = 0x80 >> bg_bits; \ - value = mask; \ + tqmask = 0x80 >> bg_bits; \ + value = tqmask; \ for (bg_bits++; bg_bits < 8; bg_bits++) { \ - mask >>= 1; \ + tqmask >>= 1; \ if (*ptr++ != bg) { \ - value |= mask; \ + value |= tqmask; \ } \ } \ *buf++ = (CARD8)value; \ } \ \ - mask = 0x80; \ + tqmask = 0x80; \ value = 0; \ if (x >= w) \ continue; \ \ for (; x < w; x++) { \ if (*ptr++ != bg) { \ - value |= mask; \ + value |= tqmask; \ } \ - mask >>= 1; \ + tqmask >>= 1; \ } \ *buf++ = (CARD8)value; \ } \ -- cgit v1.2.1