From af359ac0d647ca857e20edc3e8e46c6829a5fd70 Mon Sep 17 00:00:00 2001
From: evilynux <evilynux@5577840e-afb3-4e59-9ef3-2b7f898b1952>
Date: Wed, 10 Jan 2007 17:36:08 +0000
Subject: [PATCH] Fixed compilation error by moving min(a,b) macro to GPU.h .

---
 trunk/desmume/src/GPU.c | 4 ----
 trunk/desmume/src/GPU.h | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/trunk/desmume/src/GPU.c b/trunk/desmume/src/GPU.c
index c986e2db1..9eccbe606 100644
--- a/trunk/desmume/src/GPU.c
+++ b/trunk/desmume/src/GPU.c
@@ -553,10 +553,6 @@ void GPU_setMASTER_BRIGHT (GPU *gpu, u16 v)
 	gpu->MASTER_BRIGHT = v;
 }
 
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-
 INLINE BOOL renderline_checkWindowInside(GPU *gpu, u8 bgnum, u16 x, u16 y, BOOL *draw, BOOL *effect)
 {
 	/* priority to check the window regions: win0,win1,winobj */
diff --git a/trunk/desmume/src/GPU.h b/trunk/desmume/src/GPU.h
index 1363b08bb..3c720e3b6 100644
--- a/trunk/desmume/src/GPU.h
+++ b/trunk/desmume/src/GPU.h
@@ -127,6 +127,10 @@ typedef union
 	i.bitfield.blue  = w.bitfield.blue; \
 	i.bitfield.alpha = w.bitfield.alpha;
 
+#ifndef min
+#define min(a,b) (((a)<(b))?(a):(b))
+#endif
+
 struct _BGxCNT 
 {
 /*0*/	unsigned Priority:2;		// 0..3=high..low