diff options
| author | dscho <dscho> | 2003-12-09 15:22:11 +0000 |
|---|---|---|
| committer | dscho <dscho> | 2003-12-09 15:22:11 +0000 |
| commit | 7cb3958fd9e5cad79238e953b79ad6358e945f4a (patch) | |
| tree | d065e64b7c89bc8b0772b849d586032094e59f46 /libvncclient | |
| parent | b7643ac9aae1d0ac319d3cfc285c8ac2ff0fb0dd (diff) | |
| download | libvncserver-7cb3958fd9e5cad79238e953b79ad6358e945f4a.zip libvncserver-7cb3958fd9e5cad79238e953b79ad6358e945f4a.tar.gz | |
fix compilation with Mac OSX: preprocessor can't do recursive macros
Diffstat (limited to 'libvncclient')
| -rw-r--r-- | libvncclient/hextile.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libvncclient/hextile.c b/libvncclient/hextile.c index 14128ff..61402af 100644 --- a/libvncclient/hextile.c +++ b/libvncclient/hextile.c @@ -28,7 +28,6 @@ #define HandleHextileBPP CONCAT2E(HandleHextile,BPP) #define CARDBPP CONCAT3E(uint,BPP,_t) -#define GET_PIXEL CONCAT2E(GET_PIXEL,BPP) static rfbBool HandleHextileBPP (rfbClient* client, int rx, int ry, int rw, int rh) @@ -85,7 +84,15 @@ HandleHextileBPP (rfbClient* client, int rx, int ry, int rw, int rh) return FALSE; for (i = 0; i < nSubrects; i++) { - GET_PIXEL(fg, ptr); +#if BPP==8 + GET_PIXEL8(fg, ptr); +#elif BPP==16 + GET_PIXEL16(fg, ptr); +#elif BPP==32 + GET_PIXEL32(fg, ptr); +#else +#error "Invalid BPP" +#endif sx = rfbHextileExtractX(*ptr); sy = rfbHextileExtractY(*ptr); ptr++; |
