Attachment 1293 Details for Bug 1835 – [FIXED_X11R68x] min macro patch

[patch] [FIXED_X11R68x] min macro patch

min-macro.diff (text/plain), 993 bytes, created by Kristian Høgsberg on 2004-11-11 14:04:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2004-11-11 14:04:12 UTC

Size: 993 bytes

patch

obsolete

>? Makefile
>? min-macro.diff
>? modedefs
>? xf86DefModeSet.c
>Index: xf86pciBus.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v
>retrieving revision 1.5
>diff -u -p -r1.5 xf86pciBus.c
>--- xf86pciBus.c	12 Oct 2004 19:13:43 -0000	1.5
>+++ xf86pciBus.c	11 Nov 2004 20:08:31 -0000
>@@ -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) &&

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1835: 1293

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.