On Tue, 2010-08-10 at 09:38 +0100, Chris Wilson wrote:

> diff --git a/Xext/xace.c b/Xext/xace.c
> index e10d837..c757cad 100644
> --- a/Xext/xace.c
> +++ b/Xext/xace.c

This hunk looks correct.
 
> diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
> index b2daec7..3cbaa08 100644
> --- a/hw/xfree86/modes/xf86Crtc.c
> +++ b/hw/xfree86/modes/xf86Crtc.c
> @@ -1393,7 +1393,13 @@ xf86ModeCompare (DisplayModePtr a, DisplayModePtr b)
>      if (diff)
>       return diff;
>      diff = b->Clock - a->Clock;
> -    return diff;
> +    if (diff)
> +         return diff;
> +    if (a->Private)
> +         return -1;
> +    if (b->Private)
> +         return 1;
> +    return 0;
>  }
>  
>  /**

This hunk looks unrelated.

- ajax

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to