summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-05-13 16:51:17 +0000
committerrubidium <rubidium@openttd.org>2009-05-13 16:51:17 +0000
commit3d3b5256f027a58cbbc004057659f9e5ec38c284 (patch)
tree5abf7eea87fc7221877856fcaf28937763d78031
parent1c98cf370d41a4cd8235f9491fbab5e6aece9d1e (diff)
downloadopenttd-3d3b5256f027a58cbbc004057659f9e5ec38c284.tar.xz
(svn r16295) -Fix: ICC defined __GNUC__ but does not define __builtin_bswap32, so fall back to the default swap method for ICC.
-rw-r--r--src/core/bitmath_func.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp
index 27168e821..f32aee67c 100644
--- a/src/core/bitmath_func.hpp
+++ b/src/core/bitmath_func.hpp
@@ -318,7 +318,7 @@ static FORCEINLINE T ROR(const T x, const uint8 n)
*/
static FORCEINLINE uint32 BSWAP32(uint32 x)
{
-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ >= 3))
+#if !defined(__ICC) && defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ >= 3))
/* GCC >= 4.3 provides a builtin, resulting in faster code */
return (uint32)__builtin_bswap32((int32)x);
#else