ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation error by moving min(a,b) macro to GPU.h .

This commit is contained in:
evilynux 2007-01-10 17:36:08 +00:00
parent 7ee96932df
commit ae80da0c57
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/GPU.c
View File

@ -553,10 +553,6 @@ void GPU_setMASTER_BRIGHT (GPU *gpu, u16 v)
gpu->MASTER_BRIGHT = 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) 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 */ /* priority to check the window regions: win0,win1,winobj */

4
desmume/src/GPU.h
View File

@ -127,6 +127,10 @@ typedef union
i.bitfield.blue = w.bitfield.blue; \ i.bitfield.blue = w.bitfield.blue; \
i.bitfield.alpha = w.bitfield.alpha; i.bitfield.alpha = w.bitfield.alpha;
#ifndef min
#define min(a,b) (((a)<(b))?(a):(b))
#endif
struct _BGxCNT struct _BGxCNT
{ {
/*0*/ unsigned Priority:2; // 0..3=high..low /*0*/ unsigned Priority:2; // 0..3=high..low