diff src/fns.c @ 90970:3371fc48749b

Replace uses of GC_* macros with the non-GC_ versions.

--- a/src/fns.c	Tue Jun 26 12:02:59 2007 +0000
+++ b/src/fns.c	Fri Jun 29 03:37:33 2007 +0000
@@ -3831,7 +3831,7 @@
      struct Lisp_Hash_Table *h;
      Lisp_Object key;
 {
-  unsigned hash = XUINT (key) ^ XGCTYPE (key);
+  unsigned hash = XUINT (key) ^ XTYPE (key);
   xassert ((hash & ~INTMASK) == 0);
   return hash;
 }
@@ -3850,7 +3850,7 @@
   if (FLOATP (key))
     hash = sxhash (key, 0);
   else
-    hash = XUINT (key) ^ XGCTYPE (key);
+    hash = XUINT (key) ^ XTYPE (key);
   xassert ((hash & ~INTMASK) == 0);
   return hash;
 }
@@ -4271,7 +4271,7 @@
       /* Follow collision chain, removing entries that
 	 don't survive this garbage collection.  */
       prev = Qnil;
-      for (idx = HASH_INDEX (h, bucket); !GC_NILP (idx); idx = next)
+      for (idx = HASH_INDEX (h, bucket); !NILP (idx); idx = next)
 	{
 	  int i = XFASTINT (idx);
 	  int key_known_to_survive_p = survives_gc_p (HASH_KEY (h, i));
@@ -4296,7 +4296,7 @@
 	      if (remove_p)
 		{
 		  /* Take out of collision chain.  */
-		  if (GC_NILP (prev))
+		  if (NILP (prev))
 		    HASH_INDEX (h, bucket) = next;
 		  else
 		    HASH_NEXT (h, XFASTINT (prev)) = next;
@@ -4360,7 +4360,7 @@
   do
     {
       marked = 0;
-      for (table = Vweak_hash_tables; !GC_NILP (table); table = h->next_weak)
+      for (table = Vweak_hash_tables; !NILP (table); table = h->next_weak)
 	{
 	  h = XHASH_TABLE (table);
 	  if (h->size & ARRAY_MARK_FLAG)
@@ -4370,7 +4370,7 @@
   while (marked);
 
   /* Remove tables and entries that aren't used.  */
-  for (table = Vweak_hash_tables, used = Qnil; !GC_NILP (table); table = next)
+  for (table = Vweak_hash_tables, used = Qnil; !NILP (table); table = next)
     {
       h = XHASH_TABLE (table);
       next = h->next_weak;