From f5816d77e24850c53a9dbc4add0e87bf3031e00a Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 24 Feb 2015 09:26:41 -0700 Subject: [PATCH] mesa: remove powf macro Use the wrapper in c99_math.h if needed. Reviewed-by: Matt Turner --- src/mesa/main/imports.h | 1 - src/mesa/main/light.c | 1 + src/mesa/tnl/t_rasterpos.c | 1 + src/mesa/tnl/t_vb_light.c | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 674761171e8..1a69fe73589 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -102,7 +102,6 @@ typedef union { GLfloat f; GLint i; GLuint u; } fi_type; #define floorf(f) ((float) floor(f)) #define logf(f) ((float) log(f)) -#define powf(x,y) ((float) pow(x,y)) #define sqrtf(f) ((float) sqrt(f)) #endif diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 7a1afd95930..9db0bff49a7 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -24,6 +24,7 @@ */ +#include "c99_math.h" #include "glheader.h" #include "imports.h" #include "context.h" diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c index 2f52bb3069f..5945f64eb9c 100644 --- a/src/mesa/tnl/t_rasterpos.c +++ b/src/mesa/tnl/t_rasterpos.c @@ -23,6 +23,7 @@ */ +#include "c99_math.h" #include "main/glheader.h" #include "main/colormac.h" #include "main/feedback.h" diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c index 7e76ed40338..7781b6a6c3a 100644 --- a/src/mesa/tnl/t_vb_light.c +++ b/src/mesa/tnl/t_vb_light.c @@ -23,7 +23,7 @@ */ - +#include "c99_math.h" #include "main/glheader.h" #include "main/colormac.h" #include "main/light.h" -- 2.30.2