diff --git a/ChangeLog b/ChangeLog index eb1df56ba..c1f9a94ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Sat Nov 3 14:28:17 CET 2007 (edwin) + * libclamav/autoit.c: fix endianess checks for arm - thanks edwin + Sat Nov 3 00:25:52 EET 2007 (edwin) ------------------------------------ * libclamav/ole2_extract.c: make endian conversion macros work when operand diff --git a/libclamav/autoit.c b/libclamav/autoit.c index 5ad704f27..d45ae8157 100644 --- a/libclamav/autoit.c +++ b/libclamav/autoit.c @@ -421,18 +421,8 @@ static double LAME_fpusht(struct LAME *l) { /* return 0.0; */ /* } */ -#if WORDS_BIGENDIAN == FPU_WORDS_BIGENDIAN ret.as_uint.lo = rolled << 0x14; ret.as_uint.hi = 0x3ff00000 | (rolled >> 0xc); -#else - do { - uint32_t tmp = rolled << 0x14; - - ret.as_uint.lo = ((tmp&0xff)<<24) | (((tmp>>8)&0xff)<<16) | (((tmp>>16)&0xff)<<8) | ((tmp>>24)&0xff); - tmp = 0x3ff00000 | (rolled >> 0xc); - ret.as_uint.hi = ((tmp&0xff)<<24) | (((tmp>>8)&0xff)<<16) | (((tmp>>16)&0xff)<<8) | ((tmp>>24)&0xff); - } while(0); -#endif return ret.as_double - 1.0; }