Mercurial > hg > xemacs-beta

diff src/objects-x.c @ 647:b39c14581166

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-08-13 04:45:47 by ben] removal of unsigned, size_t, etc.
author ben
date Mon, 13 Aug 2001 04:46:48 +0000
parents 190b164ddcac
children fdefd0186b75
line wrap: on
line diff
--- a/src/objects-x.c	Wed Aug 08 12:15:04 2001 +0000
+++ b/src/objects-x.c	Mon Aug 13 04:46:48 2001 +0000
@@ -399,8 +399,8 @@
   f->height = xf->ascent + xf->descent;
   {
     /* following change suggested by Ted Phelps <phelps@dstc.edu.au> */
-    unsigned int def_char = 'n'; /*xf->default_char;*/
-    unsigned int byte1, byte2;
+    int def_char = 'n'; /*xf->default_char;*/
+    int byte1, byte2;
 
   once_more:
     byte1 = def_char >> 8;
@@ -410,10 +410,10 @@
       {
 	/* Old versions of the R5 font server have garbage (>63k) as
 	   def_char. 'n' might not be a valid character. */
-	if (byte1 < xf->min_byte1         ||
-	    byte1 > xf->max_byte1         ||
-	    byte2 < xf->min_char_or_byte2 ||
-	    byte2 > xf->max_char_or_byte2)
+	if (byte1 < (int) xf->min_byte1         ||
+	    byte1 > (int) xf->max_byte1         ||
+	    byte2 < (int) xf->min_char_or_byte2 ||
+	    byte2 > (int) xf->max_char_or_byte2)
 	  f->width = 0;
 	else
 	  f->width = xf->per_char[(byte1 - xf->min_byte1) *
@@ -429,7 +429,7 @@
        0 width too (unlikely) then just use the max width. */
     if (f->width == 0)
       {
-	if (def_char == xf->default_char)
+	if (def_char == (int) xf->default_char)
 	  f->width = xf->max_bounds.width;
 	else
 	  {
@@ -598,7 +598,7 @@
   if (result)
     {
       /* Verify that result is an XLFD name (roughly...) */
-      if (result [0] != '-' || strlen (result) < (unsigned int) 30)
+      if (result [0] != '-' || strlen (result) < 30)
 	{
 	  XFree (result);
 	  result = 0;
@@ -817,7 +817,7 @@
       Lisp_Object name, value;
       Atom atom = props [i].name;
       Bufbyte *name_str = 0;
-      size_t name_len;
+      Bytecount name_len;
       Extbyte *namestrext = XGetAtomName (dpy, atom);
 
       if (namestrext)