diff src/hash.c @ 5934:e2fae7783046 cygwin

lots of use of EMACS_INT, a few others, to eliminate all pointer truncation warnings
author Henry Thompson <ht@markup.co.uk>
date Sat, 12 Dec 2015 19:08:46 +0000
parents 308d34e9f07d
children d5eb0914ca1f
line wrap: on
line diff
--- a/src/hash.c	Thu Dec 10 17:55:59 2015 +0000
+++ b/src/hash.c	Sat Dec 12 19:08:46 2015 +0000
@@ -26,7 +26,7 @@
 #include "lisp.h"
 #include "hash.h"
 
-#define NULL_ENTRY ((void *) 0xDEADBEEF) /* -559038737 base 10 */
+#define NULL_ENTRY ((void *) (EMACS_UINT)0xDEADBEEF) /* -559038737 base 10 */
 
 #define COMFORTABLE_SIZE(size) (21 * (size) / 16)
 
@@ -214,7 +214,7 @@
 
   /* do the rehash on the "grown" table */
   {
-    long old_zero_set    = hash_table->zero_set;
+    EMACS_INT old_zero_set    = hash_table->zero_set;
     void *old_zero_entry = hash_table->zero_entry;
     clrhash (hash_table);
     hash_table->zero_set   = old_zero_set;
@@ -240,7 +240,7 @@
   if (!key)
     {
       hash_table->zero_entry = contents;
-      hash_table->zero_set = 1;
+      hash_table->zero_set = (EMACS_INT)1;
     }
   else
     {