[PATCH RESEND 4/5] dix: move #if statement to stop compiler warning

[Simon Thum]

On 10/20/2011 05:05 AM, Peter Hutterer wrote:
> ptrveloc.c: In function 'QueryTrackers':
> ptrveloc.c:598:34: warning: variable 'used_offset' set but not used
> [-Wunused-but-set-variable]
> 
> used_offset is used, but only in the debugging code. Move the #if statement
> to ignore that warning.
Clever fix. I just ignored it after figuring the amount of #ifdef's
supposedly required.

Reviewed-by: Simon Thum <simon.thum at gmx.de>


> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  dix/ptrveloc.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
> index 53a0d03..7b6f560 100644
> --- a/dix/ptrveloc.c
> +++ b/dix/ptrveloc.c
> @@ -649,13 +649,13 @@ QueryTrackers(DeviceVelocityPtr vel, int cur_t){
>  	DebugAccelF("(dix prtacc) query: last tracker in effect\n");
>  	used_offset = vel->num_tracker-1;
>      }
> -#ifdef PTRACCEL_DEBUGGING
>      if(used_offset >= 0){
> +#ifdef PTRACCEL_DEBUGGING
>  	MotionTracker *tracker = TRACKER(vel, used_offset);
>  	DebugAccelF("(dix prtacc) result: offset %i [dx: %i dy: %i diff: %i]\n",
>  	            used_offset, tracker->dx, tracker->dy, cur_t - tracker->time);
> -    }
>  #endif
> +    }
>      return result;
>  }
>