[Emacs-diffs] /srv/bzr/emacs/trunk r108436: Pacify gcc -Wdouble-precision when using Xaw.

[Paul Eggert]

------------------------------------------------------------
revno: 108436
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-30 23:51:43 -0700
message:
  Pacify gcc -Wdouble-precision when using Xaw.
  
  * xterm.c (xaw_jump_callback, x_set_toolkit_scroll_bar_thumb)
  [HAVE_X_WINDOWS && USE_TOOLKIT_SCROLL_BARS && !USE_MOTIF && !USE_GTK]:
  Use 'float' consistently, rather than 'float' in most places
  and 'double' in a couple of places.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-31 06:06:42 +0000
+++ b/src/ChangeLog     2012-05-31 06:51:43 +0000
@@ -1,3 +1,11 @@
+2012-05-31  Paul Eggert  <address@hidden>
+
+       Pacify gcc -Wdouble-precision when using Xaw.
+       * xterm.c (xaw_jump_callback, x_set_toolkit_scroll_bar_thumb)
+       [HAVE_X_WINDOWS && USE_TOOLKIT_SCROLL_BARS && !USE_MOTIF && !USE_GTK]:
+       Use 'float' consistently, rather than 'float' in most places
+       and 'double' in a couple of places.
+
 2012-05-31  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (handle_stop): Detect whether we have overlay strings

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-05-31 05:08:37 +0000
+++ b/src/xterm.c       2012-05-31 06:51:43 +0000
@@ -4529,7 +4529,7 @@
   whole = 10000000;
   portion = shown < 1 ? top * whole : 0;
 
-  if (shown < 1 && (eabs (top + shown - 1) < 1.0/height))
+  if (shown < 1 && (eabs (top + shown - 1) < 1.0f / height))
     /* Some derivatives of Xaw refuse to shrink the thumb when you reach
        the bottom, so we force the scrolling whenever we see that we're
        too close to the bottom (in x_set_toolkit_scroll_bar_thumb
@@ -4894,7 +4894,7 @@
     else
       top = old_top;
     /* Keep two pixels available for moving the thumb down.  */
-    shown = max (0, min (1 - top - (2.0 / height), shown));
+    shown = max (0, min (1 - top - (2.0f / height), shown));
 
     /* If the call to XawScrollbarSetThumb below doesn't seem to work,
        check that your system's configuration file contains a define