summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKendall Bennett <KendallB@scitechsoft.com>2003-10-03 01:38:28 +0000
committerKendall Bennett <KendallB@scitechsoft.com>2003-10-03 01:38:28 +0000
commit7d8eb0604ab8b59bea5977741729e719f7327363 (patch)
tree2dc76bad6f2530c7fae854dad0b9d4350578ed55
parentd7fe183f76c4e96d5c264c84b7dfc1665b69038b (diff)
Removed bogus OS/2 floating point->integer conversion routine
-rw-r--r--src/mesa/main/imports.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 104ef4a4c0..2c9c2fc342 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -391,9 +391,9 @@ static INLINE int iround(float f)
return r;
}
#define IROUND(x) iround(x)
-#elif defined(USE_X86_ASM) && defined(__WATCOMC__)
+#elif defined(__WATCOMC__) && defined(__386__)
long iround(float f);
-#pragma aux iround = \
+#pragma aux iround = \
"push eax" \
"fistp dword ptr [esp]" \
"pop eax" \
@@ -401,16 +401,6 @@ long iround(float f);
value [eax] \
modify exact [eax];
#define IROUND(x) iround(x)
-#elif defined(__OS2__)
-#ifndef FIST_MAGIC
-#define FIST_MAGIC ((((65536.0 * 65536.0 * 16)+(65536.0 * 0.5))* 65536.0))
-#endif
-static INLINE int iround(float x)
-{
- double dtemp = FIST_MAGIC + x;
- return ((*(int *)&dtemp) - 0x80000000);
-}
-#define IROUND(f) iround((float)f)
#else
#define IROUND(f) ((int) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
#endif