Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / libguile / tags.h

diff --git a/libguile/tags.h b/libguile/tags.h
index 54b74e0..a194ea0 100644 (file)
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -3,7 +3,7 @@
 #ifndef SCM_TAGS_H
 #define SCM_TAGS_H
 
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2008,2009,2010,2011
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2008,2009,2010,2011,2012
  * Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -391,17 +391,6 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM;
 #define scm_tc3_tc7_2           7
 
 
-/* As we have seen, heap objects have a tag in their three lowest bits.
-   If you have a heap object and want the pointer to the start of the
-   object, perhaps for GC purposes, you need to mask off the low bits,
-   which is what SCM_HEAP_OBJECT_BASE does.
-
-   Note that you can avoid this macro if you know the specific type of
-   the object (pair, struct, or other).
- */
-#define SCM_HEAP_OBJECT_BASE(x) ((scm_t_bits*)((SCM_UNPACK (x)) & ~7))
-
-
 /* Definitions for tc7: */
 
 #define SCM_ITAG7(x)           (127 & SCM_UNPACK (x))
@@ -434,14 +423,14 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM;
 #define scm_tc7_vm             55
 #define scm_tc7_vm_cont                71
 
-#define scm_tc7_prompt         61
-#define scm_tc7_with_fluids    63
+#define scm_tc7_unused_17      61
+#define scm_tc7_unused_21      63
 #define scm_tc7_unused_19      69
 #define scm_tc7_program                79
 #define scm_tc7_weak_set       85
 #define scm_tc7_weak_table     87
-#define scm_tc7_unused_20      93
-#define scm_tc7_unused_11      95
+#define scm_tc7_array          93
+#define scm_tc7_bitvector      95
 #define scm_tc7_unused_12      101
 #define scm_tc7_unused_18      103
 #define scm_tc7_unused_13      109