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:
parent
c1c6abb07a
commit
027225c75d
8
bitmap.c
8
bitmap.c
@ -21,7 +21,6 @@
|
|||||||
#include "rdesktop.h"
|
#include "rdesktop.h"
|
||||||
|
|
||||||
#define CVAL(p) (*(p++))
|
#define CVAL(p) (*(p++))
|
||||||
#define SVAL(p) ((*((p++) + 1) << 8) | CVAL(p))
|
|
||||||
|
|
||||||
#define UNROLL8(exp) { exp exp exp exp exp exp exp exp }
|
#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:
|
case 0xf:
|
||||||
opcode = code & 0xf;
|
opcode = code & 0xf;
|
||||||
if (opcode < 9)
|
if (opcode < 9)
|
||||||
count = SVAL(input);
|
{
|
||||||
|
count = CVAL(input);
|
||||||
|
count |= CVAL(input) << 8;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
count = (opcode < 0xb) ? 8 : 1;
|
count = (opcode < 0xb) ? 8 : 1;
|
||||||
|
}
|
||||||
offset = 0;
|
offset = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
10
crypto/bn.h
10
crypto/bn.h
@ -75,11 +75,13 @@ extern "C" {
|
|||||||
/* The prime number generation stuff may not work when
|
/* The prime number generation stuff may not work when
|
||||||
* EIGHT_BIT but I don't care since I've only used this mode
|
* EIGHT_BIT but I don't care since I've only used this mode
|
||||||
* for debuging the bignum libraries */
|
* for debuging the bignum libraries */
|
||||||
#undef SIXTY_FOUR_BIT_LONG
|
#if defined(__alpha__) || defined(__ia64__)
|
||||||
#undef SIXTY_FOUR_BIT
|
#define SIXTY_FOUR_BIT_LONG
|
||||||
|
#elseif defined(__mips__)
|
||||||
|
#define SIXTY_FOUR_BIT
|
||||||
|
#else
|
||||||
#define THIRTY_TWO_BIT
|
#define THIRTY_TWO_BIT
|
||||||
#undef SIXTEEN_BIT
|
#endif
|
||||||
#undef EIGHT_BIT
|
|
||||||
|
|
||||||
#undef BN_LLONG
|
#undef BN_LLONG
|
||||||
#undef BN_MUL_COMBA
|
#undef BN_MUL_COMBA
|
||||||
|
2
xwin.c
2
xwin.c
@ -998,7 +998,7 @@ ui_desktop_save(uint32 offset, int x, int y, int cx, int cy)
|
|||||||
|
|
||||||
offset *= bpp/8;
|
offset *= bpp/8;
|
||||||
cache_put_desktop(offset, cx, cy, image->bytes_per_line,
|
cache_put_desktop(offset, cx, cy, image->bytes_per_line,
|
||||||
bpp/8, image->data);
|
bpp/8, (uint8 *)image->data);
|
||||||
|
|
||||||
XDestroyImage(image);
|
XDestroyImage(image);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user