From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Mar 2011 02:15:18 +0000 (-0800)
Subject: * term.c (term_mouse_position): Rename local to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f3f1250d4f74203c828e7ba03b721b1f269a0d7;p=emacs.git

* term.c (term_mouse_position): Rename local to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a8594fb3fc6..a3695bda635 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -108,6 +108,8 @@
 	* termchar.h (struct tty_display_info): Likewise.
 	* term.c (tgetflag, tgetnum, tgetstr): Redefine to use const pointers.
 
+	* term.c (term_mouse_position): Rename local to avoid shadowing.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
diff --git a/src/term.c b/src/term.c
index 6986cfb9e03..9531cce5f9f 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2700,14 +2700,14 @@ term_mouse_movement (FRAME_PTR frame, Gpm_Event *event)
    Set *bar_window to Qnil, and *x and *y to the column and
    row of the character cell the mouse is over.
 
-   Set *time to the time the mouse was at the returned position.
+   Set *timeptr to the time the mouse was at the returned position.
 
    This clears mouse_moved until the next motion
    event arrives.  */
 static void
 term_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
 		     enum scroll_bar_part *part, Lisp_Object *x,
-		     Lisp_Object *y, unsigned long *time)
+		     Lisp_Object *y, unsigned long *timeptr)
 {
   struct timeval now;
 
@@ -2720,7 +2720,7 @@ term_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
   XSETINT (*x, last_mouse_x);
   XSETINT (*y, last_mouse_y);
   gettimeofday(&now, 0);
-  *time = (now.tv_sec * 1000) + (now.tv_usec / 1000);
+  *timeptr = (now.tv_sec * 1000) + (now.tv_usec / 1000);
 }
 
 /* Prepare a mouse-event in *RESULT for placement in the input queue.