OSF1/Alpha build fixes.

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@35 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Matt Chapman 2001-09-15 14:30:46 +00:00
parent c1c6abb07a
commit 027225c75d
3 changed files with 13 additions and 7 deletions

View File

@ -21,7 +21,6 @@
#include "rdesktop.h"
#define CVAL(p) (*(p++))
#define SVAL(p) ((*((p++) + 1) << 8) | CVAL(p))
#define UNROLL8(exp) { exp exp exp exp exp exp exp exp }
@ -75,9 +74,14 @@ bitmap_decompress(unsigned char *output, int width, int height,
case 0xf:
opcode = code & 0xf;
if (opcode < 9)
count = SVAL(input);
{
count = CVAL(input);
count |= CVAL(input) << 8;
}
else
{
count = (opcode < 0xb) ? 8 : 1;
}
offset = 0;
break;

View File

@ -75,11 +75,13 @@ extern "C" {
/* The prime number generation stuff may not work when
* EIGHT_BIT but I don't care since I've only used this mode
* for debuging the bignum libraries */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#if defined(__alpha__) || defined(__ia64__)
#define SIXTY_FOUR_BIT_LONG
#elseif defined(__mips__)
#define SIXTY_FOUR_BIT
#else
#define THIRTY_TWO_BIT
#undef SIXTEEN_BIT
#undef EIGHT_BIT
#endif
#undef BN_LLONG
#undef BN_MUL_COMBA

2
xwin.c
View File

@ -998,7 +998,7 @@ ui_desktop_save(uint32 offset, int x, int y, int cx, int cy)
offset *= bpp/8;
cache_put_desktop(offset, cx, cy, image->bytes_per_line,
bpp/8, image->data);
bpp/8, (uint8 *)image->data);
XDestroyImage(image);
}