X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fdata.c;h=c0d0594f94d377fe552854c4788f9a9f6284a229;hp=b2ef666e9d9bde4ae13bdb1b9f1af17001d550da;hb=ee38d21b330f5001b47a577cefb5ba7b82a3b7d3;hpb=79d2db7d65205bc85d471590726d0cf3af5598e0

diff --git a/src/data.c b/src/data.c
index b2ef666..c0d0594 100644
--- a/src/data.c
+++ b/src/data.c
@@ -170,10 +170,10 @@ EMACS_INT sign_extend_lisp_int (EMACS_INT num);
 EMACS_INT
 sign_extend_lisp_int (EMACS_INT num)
 {
-  if (num & (1L << (VALBITS - 1)))
-    return num | ((-1L) << VALBITS);
+  if (num & (1L << (INT_VALBITS - 1)))
+    return num | ((-1L) << INT_VALBITS);
   else
-    return num & ((1L << VALBITS) - 1);
+    return num & (EMACS_INT) ((1UL << INT_VALBITS) - 1);
 }
 
 
@@ -1769,7 +1769,7 @@ finish_marking_weak_lists (void)
 	      break;
 
 	    default:
-	      abort ();
+	      ABORT ();
 	    }
 
 	  if (need_to_mark_elem && ! marked_p (elem))
@@ -1925,7 +1925,7 @@ encode_weak_list_type (enum weak_list_type type)
     case WEAK_LIST_VALUE_ASSOC: return Qvalue_assoc;
     case WEAK_LIST_FULL_ASSOC:  return Qfull_assoc;
     default:
-      abort ();
+      ABORT ();
     }
 
   return Qnil; /* not reached */