summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2015-02-24 09:04:54 -0700
committerBrian Paul <[email protected]>2015-02-24 14:44:19 -0700
commit46ce78d4c659fcf9fb2b088424d4d16d13ab5d75 (patch)
treee2a556f00add71af25185dbe8239d241fc7b9175 /src/mesa/main
parentb2c13534f7b38eed1c5b15d73e8171d3038765c7 (diff)
mesa: replace FLOORF with floorf
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/dlist.c3
-rw-r--r--src/mesa/main/imports.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index ff9ab07c6ec..431c4b48b79 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -29,6 +29,7 @@
* Display lists management functions.
*/
+#include "c99_math.h"
#include "glheader.h"
#include "imports.h"
#include "api_arrayelt.h"
@@ -912,7 +913,7 @@ translate_id(GLsizei n, GLenum type, const GLvoid * list)
return (GLint) uiptr[n];
case GL_FLOAT:
fptr = (GLfloat *) list;
- return (GLint) FLOORF(fptr[n]);
+ return (GLint) floorf(fptr[n]);
case GL_2_BYTES:
ubptr = ((GLubyte *) list) + 2 * n;
return (GLint) ubptr[0] * 256
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index bcbcd0f3e27..9dee565aa58 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -204,15 +204,12 @@ static inline GLfloat LOG2(GLfloat x)
/***
- *** FLOORF: floor of float
*** FABSF: absolute value of float
***/
#if defined(__gnu_linux__)
/* C99 functions */
-#define FLOORF(x) floorf(x)
#define FABSF(x) fabsf(x)
#else
-#define FLOORF(x) ((GLfloat) floor(x))
#define FABSF(x) ((GLfloat) fabs(x))
#endif