- fixed compilation error in MinGW/MSYS and some warnings

This commit is contained in:
Volker Ruppert 2012-09-16 07:52:55 +00:00
parent f419798ca5
commit 35f97235ed
3 changed files with 4 additions and 4 deletions

View File

@ -1903,7 +1903,7 @@ BX_CPP_INLINE Bit32s fast_reciplog(Bit64s value, Bit32s *log2)
}
/* if we've spilled out of 32 bits, push it down under 32 */
if (value & (0xffff00000000))
if (value & BX_CONST64(0xffff00000000))
{
temp = (Bit32u)(value >> 16);
exp -= 16;
@ -2004,7 +2004,7 @@ BX_CPP_INLINE Bit64s float_to_Bit64s(Bit32u data, int fixedbits)
if (exponent < 64)
result <<= exponent;
else
result = (0x7fffffffffffffff);
result = BX_CONST64(0x7fffffffffffffff);
}
if (data & 0x80000000)
result = -result;

View File

@ -472,7 +472,7 @@ BX_CPP_INLINE Bit32s prepare_tmu(tmu_state *t)
BX_CPP_INLINE Bit32s round_coordinate(float value)
{
Bit32s result = floor(value);
Bit32s result = (Bit32s)floor(value);
return result + (value - (float)result > 0.5f);
}

View File

@ -293,4 +293,4 @@ RASTERIZER_ENTRY( 0x01022401, 0x00000000, 0x00000000, 0x00000F73, 0x08241A17, 0x
RASTERIZER_ENTRY( 0x01022401, 0x00000000, 0x00000000, 0x00000F71, 0x08241A07, 0x08241A07 )
RASTERIZER_ENTRY( 0x01022401, 0x00000000, 0x00000000, 0x00000F73, 0x08241A07, 0x08241A07 )
RASTERIZER_ENTRY( 0x00002405, 0x0000441F, 0x00000000, 0x00000B73, 0x08241A07, 0x08241A07 )
RASTERIZER_ENTRY( 0x00002405, 0x0000511F, 0x00000000, 0x00000B73, 0x08241A07, 0x08241A07 )
RASTERIZER_ENTRY( 0x00002405, 0x0000511F, 0x00000000, 0x00000B73, 0x08241A07, 0x08241A07 )