$NetBSD$

--- ../Mesa-7.0.4/src/mesa/main/imports.h.orig	2008-06-24 14:27:44.000000000 -0400
+++ ../Mesa-7.0.4/src/mesa/main/imports.h
@@ -292,7 +292,7 @@ static INLINE int GET_FLOAT_BITS( float 
  *** LDEXPF: multiply value by an integral power of two
  *** FREXPF: extract mantissa and exponent from value
  ***/
-#if defined(__gnu_linux__)
+#if defined(USE_NATIVE_LIBM_FUNCS)
 /* C99 functions */
 #define CEILF(x)   ceilf(x)
 #define FLOORF(x)  floorf(x)
@@ -515,7 +515,9 @@ static INLINE int iceil(float f)
 /* Hardware default: All exceptions masked, extended double precision,
  * round to nearest (IEEE compliant):
  */
+#ifndef DEFAULT_X86_FPU
 #define DEFAULT_X86_FPU		0x037f
+#endif
 /* All exceptions masked, single precision, round to nearest:
  */
 #define FAST_X86_FPU		0x003f