X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Flrecord.h;h=f26ffa2dfda890f5fc2138fa8a1bfe16d98466aa;hb=87c4768b9f74b6d48fb56908f29fb1dccadb11ea;hp=6ae858141828fba744ac938421bb20fcd4aa45bb;hpb=1d9bc86590766427e2431876a50d78206a99edd5;p=chise%2Fxemacs-chise.git-

diff --git a/src/lrecord.h b/src/lrecord.h
index 6ae8581..f26ffa2 100644
--- a/src/lrecord.h
+++ b/src/lrecord.h
@@ -75,35 +75,11 @@ struct lrecord_header
 
   /* 1 if the object is readonly from lisp */
   unsigned int lisp_readonly :1;
-
-#ifdef UTF2000
-  /* The `older field is a flag that indicates whether this lcrecord
-     is on a "older storage". */
-  unsigned int older :1;
-#endif
 };
 
 struct lrecord_implementation;
 int lrecord_type_index (const struct lrecord_implementation *implementation);
 
-#ifdef UTF2000
-#define set_lheader_implementation(header,imp) do {	\
-  struct lrecord_header* SLI_header = (header);		\
-  SLI_header->type = (imp)->lrecord_type_index;		\
-  SLI_header->mark = 0;					\
-  SLI_header->older = 0;				\
-  SLI_header->c_readonly = 0;				\
-  SLI_header->lisp_readonly = 0;			\
-} while (0)
-#define set_lheader_older_implementation(header,imp) do {	\
-  struct lrecord_header* SLI_header = (header);			\
-  SLI_header->type = (imp)->lrecord_type_index;			\
-  SLI_header->mark = 0;						\
-  SLI_header->older = 1;					\
-  SLI_header->c_readonly = 0;					\
-  SLI_header->lisp_readonly = 0;				\
-} while (0)
-#else
 #define set_lheader_implementation(header,imp) do {	\
   struct lrecord_header* SLI_header = (header);		\
   SLI_header->type = (imp)->lrecord_type_index;		\
@@ -111,7 +87,6 @@ int lrecord_type_index (const struct lrecord_implementation *implementation);
   SLI_header->c_readonly = 0;				\
   SLI_header->lisp_readonly = 0;			\
 } while (0)
-#endif
 
 struct lcrecord_header
 {
@@ -179,7 +154,6 @@ enum lrecord_type
   lrecord_type_coding_system,
   lrecord_type_char_table,
   lrecord_type_char_table_entry,
-  lrecord_type_char_id_table,
   lrecord_type_byte_table,
   lrecord_type_uint16_byte_table,
   lrecord_type_uint8_byte_table,
@@ -217,6 +191,9 @@ enum lrecord_type
   lrecord_type_pgresult,
   lrecord_type_devmode,
   lrecord_type_mswindows_dialog_id,
+  lrecord_type_case_table,
+  lrecord_type_free, /* only used for "free" lrecords */
+  lrecord_type_undefined, /* only used for debugging */
   lrecord_type_last_built_in_type /* must be last */
 };
 
@@ -309,10 +286,6 @@ extern int gc_in_progress;
 #define MARK_RECORD_HEADER(lheader)   ((void) ((lheader)->mark = 1))
 #define UNMARK_RECORD_HEADER(lheader) ((void) ((lheader)->mark = 0))
 
-#define OLDER_RECORD_P(obj) (XRECORD_LHEADER (obj)->older)
-#define OLDER_RECORD_HEADER_P(lheader) ((lheader)->older)
-
-
 #define C_READONLY_RECORD_HEADER_P(lheader)  ((lheader)->c_readonly)
 #define LISP_READONLY_RECORD_HEADER_P(lheader)  ((lheader)->lisp_readonly)
 #define SET_C_READONLY_RECORD_HEADER(lheader) do {	\
@@ -361,10 +334,6 @@ extern int gc_in_progress;
   An array of Lisp objects or pointers to lrecords.
   The third element is the count.
 
-    XD_LO_RESET_NIL
-  Lisp objects which will be reset to Qnil when dumping.  Useful for cleaning
-  up caches.
-
     XD_LO_LINK
   Link in a linked list of objects of the same type.
 
@@ -419,7 +388,6 @@ extern int gc_in_progress;
 enum lrecord_description_type {
   XD_LISP_OBJECT_ARRAY,
   XD_LISP_OBJECT,
-  XD_LO_RESET_NIL,
   XD_LO_LINK,
   XD_OPAQUE_PTR,
   XD_STRUCT_PTR,
@@ -781,14 +749,6 @@ void *alloc_lcrecord (size_t size, const struct lrecord_implementation *);
 #define alloc_lcrecord_type(type, lrecord_implementation) \
   ((type *) alloc_lcrecord (sizeof (type), lrecord_implementation))
 
-#ifdef UTF2000
-void *
-alloc_older_lcrecord (size_t size, const struct lrecord_implementation *);
-
-#define alloc_older_lcrecord_type(type, lrecord_implementation) \
-  ((type *) alloc_older_lcrecord (sizeof (type), lrecord_implementation))
-#endif
-
 /* Copy the data from one lcrecord structure into another, but don't
    overwrite the header information. */