From ba15832b9eb98aa6dea5d4ef01be4bbfe1116773 Mon Sep 17 00:00:00 2001 From: Jordan Klassen Date: Fri, 1 May 2015 12:54:14 -0700 Subject: Fix CLAMP macro overwritten by glib headers Fixes #188 When I moved the macro definition below all of the includes, I got the following compiler warning: /usr/include/glib-2.0/glib/gmacros.h:246:0: note: this is the location of the previous definition #define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x))) So, that's the macro definition that was being used whenever "CLAMP" was used. It's pretty obvious what went wrong. --- src/redshift.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/redshift.c') diff --git a/src/redshift.c b/src/redshift.c index 0fcb0ba..8a83c4f 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -49,11 +49,6 @@ #include "systemtime.h" #include "hooks.h" - -#define MIN(x,y) ((x) < (y) ? (x) : (y)) -#define MAX(x,y) ((x) > (y) ? (x) : (y)) -#define CLAMP(lo,x,up) (MAX((lo), MIN((x), (up)))) - /* pause() is not defined on windows platform but is not needed either. Use a noop macro instead. */ #ifdef __WIN32__ @@ -97,6 +92,8 @@ # include "location-corelocation.h" #endif +#undef CLAMP +#define CLAMP(lo,mid,up) (((lo) > (mid)) ? (lo) : (((mid) < (up)) ? (mid) : (up))) /* Union of state data for gamma adjustment methods */ typedef union { @@ -978,8 +975,7 @@ run_continual_mode(const location_t *loc, } /* Clamp alpha value */ - adjustment_alpha = - MAX(0.0, MIN(adjustment_alpha, 1.0)); + adjustment_alpha = CLAMP(0.0, adjustment_alpha, 1.0); } /* Interpolate between 6500K and calculated -- cgit v1.2.3-70-g09d2