frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetic fix to make xf86pciBus.c use standard min() macro.

This commit is contained in:
Kristian Høgsberg 2004-11-11 20:10:28 +00:00
parent e5040e24f0
commit a97548b1c9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/common/xf86pciBus.c
View File

@ -104,9 +104,6 @@ static PciBusPtr xf86PciBus = NULL;
#define PCI_MEM32_LENGTH_MAX 0xFFFFFFFF #define PCI_MEM32_LENGTH_MAX 0xFFFFFFFF
#undef MIN
#define MIN(x,y) ((x<y)?x:y)
#define B2M(tag,base) pciBusAddrToHostAddr(tag,PCI_MEM,base) #define B2M(tag,base) pciBusAddrToHostAddr(tag,PCI_MEM,base)
#define B2I(tag,base) (base) #define B2I(tag,base) (base)
#define B2H(tag,base,type) (((type & ResPhysMask) == ResMem) ? \ #define B2H(tag,base,type) (((type & ResPhysMask) == ResMem) ? \
@ -1649,7 +1646,7 @@ getValidBIOSBase(PCITAG tag, int num)
m = xf86JoinResLists(m,tmp); m = xf86JoinResLists(m,tmp);
tmp = m; tmp = m;
while (tmp) { while (tmp) {
tmp->block_end = MIN(tmp->block_end,PCI_MEM32_LENGTH_MAX); tmp->block_end = min(tmp->block_end,PCI_MEM32_LENGTH_MAX);
tmp = tmp->next; tmp = tmp->next;
} }
} else if ((pbp->primary == pvp->bus) && } else if ((pbp->primary == pvp->bus) &&