From: DRC Date: Mon, 28 Sep 2009 08:19:40 +0000 (+0000) Subject: Not all platforms define __WORDSIZE X-Git-Tag: v1.0.90~385 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35eee0beee4f333a9ee2987292ecdedaee2c6746;p=tigervnc.git Not all platforms define __WORDSIZE git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3902 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- diff --git a/common/jpeg/jdhuff.h b/common/jpeg/jdhuff.h index 8e50bbfb..a7c8188f 100644 --- a/common/jpeg/jdhuff.h +++ b/common/jpeg/jdhuff.h @@ -73,8 +73,17 @@ EXTERN(void) jpeg_make_d_derived_tbl * necessary. */ -typedef long bit_buf_type; /* type of bit-extraction buffer */ -#define BIT_BUF_SIZE __WORDSIZE /* size of buffer in bits */ +#if __WORDSIZE == 64 + +typedef long bit_buf_type; /* type of bit-extraction buffer */ +#define BIT_BUF_SIZE 64 /* size of buffer in bits */ + +#else + +typedef INT32 bit_buf_type; /* type of bit-extraction buffer */ +#define BIT_BUF_SIZE 32 /* size of buffer in bits */ + +#endif /* If long is > 32 bits on your machine, and shifting/masking longs is * reasonably fast, making bit_buf_type be long and setting BIT_BUF_SIZE