Partially sync files.el from XEmacs 21.5 for wildcard support.

[sxemacs] / src / lrecord.h

diff --git a/src/lrecord.h b/src/lrecord.h
index 1435aba..40d58d7 100644 (file)
--- a/src/lrecord.h
+++ b/src/lrecord.h
@@ -74,8 +74,9 @@ struct lrecord_header {
        /* 1 if the object is readonly from lisp */
        unsigned int lisp_readonly:1;
 
-       long unsigned int hash_cache;
        unsigned int morphisms:/*number_of_cat_morphism_kinds => */6;
+
+       long unsigned int hash_cache;
 };
 
 struct lrecord_implementation;
@@ -88,6 +89,8 @@ int lrecord_type_index(const struct lrecord_implementation *implementation);
                SLI_header->mark = 0;                           \
                SLI_header->c_readonly = 0;                     \
                SLI_header->lisp_readonly = 0;                  \
+               SLI_header->morphisms = 0;                      \
+               SLI_header->hash_cache = 0;                     \
        } while (0)
 
 struct lcrecord_header {
@@ -191,8 +194,6 @@ enum lrecord_type {
        lrecord_type_devmode,
        lrecord_type_case_table,
        lrecord_type_emacs_ffi,
-       lrecord_type_emacs_gtk_object,
-       lrecord_type_emacs_gtk_boxed,
        lrecord_type_ffiobject, /* 60 */
        lrecord_type_evp_pkey,
        lrecord_type_ssl_conn,
@@ -683,7 +684,7 @@ error_check_##c_name (Lisp_Object obj)                              \
 }                                                              \
 extern Lisp_Object Q##c_name##p
 
-# define DECLARE_EXTERNAL_LRECORD(c_name, structtype)          \
+# define DECLARE_EXTERNAL_LRECORD(c_name, structtype)          \
 extern unsigned int lrecord_type_##c_name;                      \
 extern struct lrecord_implementation lrecord_##c_name;         \
 extern_inline structtype *                                     \