--- simon1decr.c.orig Tue May 27 16:34:14 2003 +++ simon1decr.c Tue May 27 16:34:34 2003 @@ -26,14 +26,9 @@ #define EndGetM32(a) ((((a)[0])<<24)|(((a)[1])<<16)|(((a)[2])<<8)|((a)[3])) -#define SD_GETBIT(var) do { \ - if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } \ - (var) = bb & 1; bb >>= 1; \ -} while (0) +#define SD_GETBIT(var) do { if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } (var) = bb & 1; bb >>= 1; } while (0) -#define SD_GETBITS(var, nbits) do { \ - bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } \ -} while (0) +#define SD_GETBITS(var, nbits) do { bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } } while (0) #define SD_TYPE_LITERAL (0) #define SD_TYPE_MATCH (1)