Description: SDLNet_(Read|Write)(16|32) assume host endianness is always LE This patch is related with bug report #212570 (bad aligned access considerations on ARM), and the arm.patch Author: Sam Hocevar Last-Update: 2003-10-23 Bug-Debian: http://bugs.debian.org/217221 --- a/SDL_net.h +++ b/SDL_net.h @@ -356,7 +356,6 @@ #define SDLNet_Write16(value, areap) \ (*(Uint16 *)(areap) = SDL_SwapBE16(value)) #else -#if SDL_BYTEORDER == SDL_BIG_ENDIAN #define SDLNet_Write16(value, areap) \ do \ { \ @@ -364,15 +363,6 @@ area[0] = (value >> 8) & 0xFF; \ area[1] = value & 0xFF; \ } while ( 0 ) -#else -#define SDLNet_Write16(value, areap) \ -do \ -{ \ - Uint8 *area = (Uint8 *)(areap); \ - area[1] = (value >> 8) & 0xFF; \ - area[0] = value & 0xFF; \ -} while ( 0 ) -#endif #endif /* !SDL_DATA_ALIGNED */ /* Write a 32 bit value to network packet buffer */ @@ -380,7 +370,6 @@ #define SDLNet_Write32(value, areap) \ *(Uint32 *)(areap) = SDL_SwapBE32(value); #else -#if SDL_BYTEORDER == SDL_BIG_ENDIAN #define SDLNet_Write32(value, areap) \ do \ { \ @@ -390,17 +379,6 @@ area[2] = (value >> 8) & 0xFF; \ area[3] = value & 0xFF; \ } while ( 0 ) -#else -#define SDLNet_Write32(value, areap) \ -do \ -{ \ - Uint8 *area = (Uint8 *)(areap); \ - area[3] = (value >> 24) & 0xFF; \ - area[2] = (value >> 16) & 0xFF; \ - area[1] = (value >> 8) & 0xFF; \ - area[0] = value & 0xFF; \ -} while ( 0 ) -#endif #endif /* !SDL_DATA_ALIGNED */ /* Read a 16 bit value from network packet buffer */ @@ -408,13 +386,8 @@ #define SDLNet_Read16(areap) \ (SDL_SwapBE16(*(Uint16 *)(areap))) #else -#if SDL_BYTEORDER == SDL_BIG_ENDIAN #define SDLNet_Read16(areap) \ ((((Uint8 *)areap)[0] << 8) | ((Uint8 *)areap)[1] << 0) -#else -#define SDLNet_Read16(areap) \ - ((((Uint8 *)areap)[1] << 8) | ((Uint8 *)areap)[0] << 0) -#endif #endif /* !SDL_DATA_ALIGNED */ /* Read a 32 bit value from network packet buffer */ @@ -422,15 +395,9 @@ #define SDLNet_Read32(areap) \ (SDL_SwapBE32(*(Uint32 *)(areap))) #else -#if SDL_BYTEORDER == SDL_BIG_ENDIAN #define SDLNet_Read32(areap) \ ((((Uint8 *)areap)[0] << 24) | (((Uint8 *)areap)[1] << 16) | \ (((Uint8 *)areap)[2] << 8) | ((Uint8 *)areap)[3] << 0) -#else -#define SDLNet_Read32(areap) \ - ((((Uint8 *)areap)[3] << 24) | (((Uint8 *)areap)[2] << 16) | \ - (((Uint8 *)areap)[1] << 8) | ((Uint8 *)areap)[0] << 0) -#endif #endif /* !SDL_DATA_ALIGNED */ #ifdef MACOS_OPENTRANSPORT