diff options
| author | Eric Anholt <anholt@freebsd.org> | 2016-10-29 11:28:02 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:11:41 +0100 |
| commit | 508d2deae98846111299a3693033a507010e3c91 (patch) | |
| tree | ee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/extras/Mesa/src/mesa/main/imports.h | |
| parent | 62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff) | |
| download | nx-libs-508d2deae98846111299a3693033a507010e3c91.tar.gz nx-libs-508d2deae98846111299a3693033a507010e3c91.tar.bz2 nx-libs-508d2deae98846111299a3693033a507010e3c91.zip | |
Remove libcwrapper usage from xorg server modules. The libcwrapper is not used in nxagent.
From c3d14036729fd186d4ec7ca1de603e1f2d174e2f Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Fri, 10 Feb 2006 22:00:30 +0000
Subject: Remove libcwrapper usage from xorg server modules. The libcwrapper is
only of (marginal) use in the drivers, and that usage remains.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Fixes ArcticaProject/nx-libs#246 (together with merge commit
ecd335fa61551d0b86d3f075469a7743ab899d95).
Diffstat (limited to 'nx-X11/extras/Mesa/src/mesa/main/imports.h')
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/main/imports.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/nx-X11/extras/Mesa/src/mesa/main/imports.h b/nx-X11/extras/Mesa/src/mesa/main/imports.h index 37e808fc4..7c7a90a74 100644 --- a/nx-X11/extras/Mesa/src/mesa/main/imports.h +++ b/nx-X11/extras/Mesa/src/mesa/main/imports.h @@ -217,8 +217,6 @@ typedef union { GLfloat f; GLint i; } fi_type; ***/ #if 0 /* _mesa_sqrtf() not accurate enough - temporarily disabled */ # define SQRTF(X) _mesa_sqrtf(X) -#elif defined(XFree86LOADER) && defined(IN_MODULE) -# define SQRTF(X) (float) xf86sqrt((float) (X)) #else # define SQRTF(X) (float) sqrt((float) (X)) #endif @@ -265,9 +263,6 @@ static INLINE GLfloat LOG2(GLfloat val) num.f = ((-1.0f/3) * num.f + 2) * num.f - 2.0f/3; return num.f + log_2; } -#elif defined(XFree86LOADER) && defined(IN_MODULE) -#define LOG2(x) ((GLfloat) (xf86log(x) * 1.442695)) -#else /* * NOTE: log_base_2(x) = log(x) / log(2) * NOTE: 1.442695 = 1/log(2). @@ -275,7 +270,6 @@ static INLINE GLfloat LOG2(GLfloat val) #define LOG2(x) ((GLfloat) (log(x) * 1.442695F)) #endif - /*** *** IS_INF_OR_NAN: test if float is infinite or NaN ***/ @@ -337,15 +331,7 @@ static INLINE int GET_FLOAT_BITS( float x ) *** LDEXPF: multiply value by an integral power of two *** FREXPF: extract mantissa and exponent from value ***/ -#if defined(XFree86LOADER) && defined(IN_MODULE) -#define CEILF(x) ((GLfloat) xf86ceil(x)) -#define FLOORF(x) ((GLfloat) xf86floor(x)) -#define FABSF(x) ((GLfloat) xf86fabs(x)) -#define LOGF(x) ((GLfloat) xf86log(x)) -#define EXPF(x) ((GLfloat) xf86exp(x)) -#define LDEXPF(x,y) ((GLfloat) xf86ldexp(x,y)) -#define FREXPF(x,y) ((GLfloat) xf86frexp(x,y)) -#elif defined(__gnu_linux__) +#if defined(__gnu_linux__) /* C99 functions */ #define CEILF(x) ceilf(x) #define FLOORF(x) floorf(x) |