From 695a39808a54b72be82dca7e7a46a25d98add65b Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Fri, 12 Jul 2013 09:55:45 +0200 Subject: [PATCH] Change MAX to MAXVAL to avoid name clashes. --- epplets/E-Cpu.c | 16 ++++++++-------- epplets/E-NetFlame.c | 16 ++++++++-------- epplets/cloak.c | 16 ++++++++-------- epplets/esdcloak.c | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/epplets/E-Cpu.c b/epplets/E-Cpu.c index 298f7a3..bd4a72e 100644 --- a/epplets/E-Cpu.c +++ b/epplets/E-Cpu.c @@ -76,7 +76,7 @@ static void flame_col(int r1, int g1, int b1, int r2, int g2, int b2, #define VSPREAD 160 #define RESIDUAL 75 -#define MAX 255 +#define MAXVAL 255 static void flame_col(int r1, int g1, int b1, int r2, int g2, int b2, int r3, int g3, @@ -133,7 +133,7 @@ draw_flame(void) hspread[x] = HSPREAD + (load_val[(x * cpus) / 40] / 50); residual[x] = RESIDUAL + (load_val[(x * cpus) / 40] / 50); ptr[x] = (rand() % ((load_val[(x * cpus) / 40]) + 155)); - if (ptr[x] > MAX) + if (ptr[x] > MAXVAL) ptr[x] = 0; else if (ptr[x] < 0) ptr[x] = 0; @@ -163,14 +163,14 @@ draw_flame(void) val3 = (ptr[x] * residual[x]) >> 8; ptr[x - 1] += val2; - if (ptr[x - 1] > MAX) - ptr[x - 1] = MAX; + if (ptr[x - 1] > MAXVAL) + ptr[x - 1] = MAXVAL; ptr[x - 40] += val1; - if (ptr[x - 40] > MAX) - ptr[x - 40] = MAX; + if (ptr[x - 40] > MAXVAL) + ptr[x - 40] = MAXVAL; ptr[x + 1] += val2; - if (ptr[x + 1] > MAX) - ptr[x + 1] = MAX; + if (ptr[x + 1] > MAXVAL) + ptr[x + 1] = MAXVAL; ptr[x] = val3; } } diff --git a/epplets/E-NetFlame.c b/epplets/E-NetFlame.c index 72f19d2..731f72f 100644 --- a/epplets/E-NetFlame.c +++ b/epplets/E-NetFlame.c @@ -86,7 +86,7 @@ static void epplet_bandwidth(void *data); #define WIDTH 40 #define HEIGHT 30 -#define MAX 255 +#define MAXVAL 255 #define DOWN 0 #define UP 1 @@ -155,7 +155,7 @@ draw_flame(void) * load ... gives randomness to flames */ ptr[x] = (rand() % ((load_val[(x * DIVISIONS) / WIDTH]) + 155)); /* bounds checking */ - if (ptr[x] > MAX) + if (ptr[x] > MAXVAL) { ptr[x] = 0; } @@ -202,16 +202,16 @@ draw_flame(void) /* add val2 to B */ ptr[x - 1] += val2; - if (ptr[x - 1] > MAX) - ptr[x - 1] = MAX; + if (ptr[x - 1] > MAXVAL) + ptr[x - 1] = MAXVAL; /* add val1 to A */ ptr[x - WIDTH] += val1; - if (ptr[x - WIDTH] > MAX) - ptr[x - WIDTH] = MAX; + if (ptr[x - WIDTH] > MAXVAL) + ptr[x - WIDTH] = MAXVAL; /* add val2 to D */ ptr[x + 1] += val2; - if (ptr[x + 1] > MAX) - ptr[x + 1] = MAX; + if (ptr[x + 1] > MAXVAL) + ptr[x + 1] = MAXVAL; /* add val3 to C */ ptr[x] = val3; } diff --git a/epplets/cloak.c b/epplets/cloak.c index 6b722b7..873995c 100644 --- a/epplets/cloak.c +++ b/epplets/cloak.c @@ -6,7 +6,7 @@ #define HSPREAD 10 #define VSPREAD 160 #define RESIDUAL 75 -#define MAX 255 +#define MAXVAL 255 double prev_val = 0.0; int *flame = NULL; int *vspread, *hspread, *residual; @@ -215,7 +215,7 @@ draw_flame(void) hspread[x] = HSPREAD + (load_val / 50); residual[x] = RESIDUAL + (load_val / 50); ptr[x] = (rand() % (load_val + 155)); - if (ptr[x] > MAX) + if (ptr[x] > MAXVAL) ptr[x] = 0; else if (ptr[x] < 0) ptr[x] = 0; @@ -230,14 +230,14 @@ draw_flame(void) val3 = (ptr[x] * residual[x]) >> 8; ptr[x - 1] += val2; - if (ptr[x - 1] > MAX) - ptr[x - 1] = MAX; + if (ptr[x - 1] > MAXVAL) + ptr[x - 1] = MAXVAL; ptr[x - 40] += val1; - if (ptr[x - 40] > MAX) - ptr[x - 40] = MAX; + if (ptr[x - 40] > MAXVAL) + ptr[x - 40] = MAXVAL; ptr[x + 1] += val2; - if (ptr[x + 1] > MAX) - ptr[x + 1] = MAX; + if (ptr[x + 1] > MAXVAL) + ptr[x + 1] = MAXVAL; ptr[x] = val3; } } diff --git a/epplets/esdcloak.c b/epplets/esdcloak.c index 1671b84..6505f36 100644 --- a/epplets/esdcloak.c +++ b/epplets/esdcloak.c @@ -6,7 +6,7 @@ #define HSPREAD 10 #define VSPREAD 160 #define RESIDUAL 75 -#define MAX 255 +#define MAXVAL 255 double prev_val = 0.0; int *flame = NULL; int *vspread, *hspread, *residual; @@ -226,7 +226,7 @@ draw_flame(void) hspread[x] = HSPREAD + (load_val / 50); residual[x] = RESIDUAL + (load_val / 50); ptr[x] = (rand() % (load_val + 155)); - if (ptr[x] > MAX) + if (ptr[x] > MAXVAL) ptr[x] = 0; else if (ptr[x] < 0) ptr[x] = 0; @@ -265,14 +265,14 @@ draw_flame(void) val3 = (ptr[x] * residual[x]) >> 8; ptr[x - 1] += val2; - if (ptr[x - 1] > MAX) - ptr[x - 1] = MAX; + if (ptr[x - 1] > MAXVAL) + ptr[x - 1] = MAXVAL; ptr[x - 40] += val1; - if (ptr[x - 40] > MAX) - ptr[x - 40] = MAX; + if (ptr[x - 40] > MAXVAL) + ptr[x - 40] = MAXVAL; ptr[x + 1] += val2; - if (ptr[x + 1] > MAX) - ptr[x + 1] = MAX; + if (ptr[x + 1] > MAXVAL) + ptr[x + 1] = MAXVAL; ptr[x] = val3; } }