diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-11-30 17:47:07 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-11-30 17:47:07 -0800 |
commit | 650e02003fbb5511ec758d993b7ec0a302ee2235 (patch) | |
tree | 96ff849518962856e51b2e3a26b78ba008b2f9ad /src/mesa/main/compiler.h | |
parent | 270d36da146b899d39e08f830fe34b63833a3731 (diff) | |
parent | 587a52e95bbe96788e8b96b63f091bb3022fc048 (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main/compiler.h')
-rw-r--r-- | src/mesa/main/compiler.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 380663ec97..87c3b2e562 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -234,7 +234,12 @@ extern "C" { #elif defined(__APPLE__) #include <CoreFoundation/CFByteOrder.h> #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) -#else /*__linux__ __APPLE__*/ +#elif defined(_AIX) +#define CPU_TO_LE32( x ) x = ((x & 0x000000ff) << 24) | \ + ((x & 0x0000ff00) << 8) | \ + ((x & 0x00ff0000) >> 8) | \ + ((x & 0xff000000) >> 24); +#else /*__linux__ */ #include <sys/endian.h> #define CPU_TO_LE32( x ) bswap32( x ) #endif /*__linux__*/ |