diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-08 06:07:57 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-08 06:07:57 +0000 |
| commit | 3f3633749dbbd082581a892e24a7326e00e5a5ab (patch) | |
| tree | 7a61641f8bd33ecd5704dd79f25fdcf800835cb0 | |
| parent | 718c18d81a1de8c0809c2718c604e62541a7f5a9 (diff) | |
//bugs.freedesktop.org/show_bug.cgi?id=1835) attachment #1293
(https://bugs.freedesktop.org/attachment.cgi?id=1293): Fixing the
problem that xf86pciInfo.c was using it's own broken MIN() macro. Patch
by Kristian Høgsberg <krh@bitplanet.net>.
| -rw-r--r-- | hw/xfree86/common/xf86pciBus.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index c5a022bf9..ec55f6360 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -104,9 +104,6 @@ static PciBusPtr xf86PciBus = NULL; #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 B2I(tag,base) (base) #define B2H(tag,base,type) (((type & ResPhysMask) == ResMem) ? \ @@ -1649,7 +1646,7 @@ getValidBIOSBase(PCITAG tag, int num) m = xf86JoinResLists(m,tmp); tmp = m; 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; } } else if ((pbp->primary == pvp->bus) && |