summaryrefslogtreecommitdiff
path: root/src/mesa/main/imports.h
diff options
context:
space:
mode:
authorPhilippe Houdoin <phoudoin@freedesktop.org>2004-08-24 08:54:04 +0000
committerPhilippe Houdoin <phoudoin@freedesktop.org>2004-08-24 08:54:04 +0000
commitf43cc67616e5f48265be50e9b3867f004f69a61b (patch)
tree0cbc55baea661d86851bf57b1c8a3e44a4430198 /src/mesa/main/imports.h
parent0f539de57e715d00cdd7f8fc34e56491cae59a5f (diff)
Disable x86 iround() version on BeOS with gcc < 2.95.x, as it choke GAS.
BTW, that's remove the requirement to build Mesa on BeOS with gcc 2.95.3. Still recommanded for performance, thought ;-)
Diffstat (limited to 'src/mesa/main/imports.h')
-rw-r--r--src/mesa/main/imports.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index bc2cc8bc8b..6b705f6415 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -377,7 +377,8 @@ static INLINE int iround(float f)
return r;
}
#define IROUND(x) iround(x)
-#elif defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
+#elif defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__) && \
+ (!defined(__BEOS__) || (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)))
static INLINE int iround(float f)
{
int r;