[PATCH 1/2] xibarriers: Remove accidental use of the comma operator

Peter Hutterer peter.hutterer at who-t.net
Mon Mar 4 03:15:29 PST 2013


On Sun, Mar 03, 2013 at 04:50:55AM -0500, Jasper St. Pierre wrote:
> From: "Jasper St. Pierre" <jstpierre at mecheye.net>

both merged, thank you.

Cheers,
   Peter

> 
> ---
>  Xi/xibarriers.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
> index 7b7b83f..a225cbc 100644
> --- a/Xi/xibarriers.c
> +++ b/Xi/xibarriers.c
> @@ -676,8 +676,8 @@ BarrierFreeBarrier(void *data, XID id)
>              continue;
>  
>          ev.deviceid = dev->id;
> -        ev.event_id = pbd->barrier_event_id,
> -        ev.dt = ms - pbd->last_timestamp,
> +        ev.event_id = pbd->barrier_event_id;
> +        ev.dt = ms - pbd->last_timestamp;
>  
>          GetSpritePosition(dev, &root_x, &root_y);
>          ev.root_x = root_x;
> -- 
> 1.8.1.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list