Fixed compilation error by moving min(a,b) macro to GPU.h .
This commit is contained in:
parent
7ee96932df
commit
ae80da0c57
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue