* xterm.c (x_alloc_nearest_color_1): Avoid unportable int assumption.

Emacs assumes two's complement elsewhere, but the assumption is
easy to remove here, and this suppresses a warning with Sun C 5.8.

diff --git a/src/ChangeLog b/src/ChangeLog
index 90c64e143bebf1b2cd8bc9420eee58e5d73ba617..5a269965186ab31edb2f350401e7cef18b5dbdde 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-06  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xterm.c (x_alloc_nearest_color_1): Avoid unportable int assumption.
+       Emacs assumes two's complement elsewhere, but the assumption is
+       easy to remove here, and this suppresses a warning with Sun C 5.8.
+
        conform to C89 pointer rules
 
        * xterm.c (x_draw_fringe_bitmap, handle_one_xevent, x_bitmap_icon):

diff --git a/src/xterm.c b/src/xterm.c
index 034df89679c3d1c25621bcbb6e93da6cbecc17d9..31f002fa05cc122bce1aaae2bebc44615367d478 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1706,7 +1706,7 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color)
         a least-squares matching, which is what X uses for closest
         color matching with StaticColor visuals.  */
       int nearest, i;
-      unsigned long nearest_delta = ~0;
+      unsigned long nearest_delta = ~ (unsigned long) 0;
       int ncells;
       const XColor *cells = x_color_cells (dpy, &ncells);