X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fopaque.c;h=2fb6dec47d77f7341abbe894935a9b38ee64f7e1;hb=4aa6e8eb91e514ddfac11bc89a946b247cdf99d1;hp=a860cb12a43da1aec81cd05730dcf62d83a1ce31;hpb=716cfba952c1dc0d2cf5c968971f3780ba728a89;p=chise%2Fxemacs-chise.git

diff --git a/src/opaque.c b/src/opaque.c
index a860cb1..2fb6dec 100644
--- a/src/opaque.c
+++ b/src/opaque.c
@@ -44,7 +44,7 @@ Lisp_Object Vopaque_ptr_free_list;
 static void
 print_opaque (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
-  CONST Lisp_Opaque *p = XOPAQUE (obj);
+  const Lisp_Opaque *p = XOPAQUE (obj);
   char buf[200];
 
   sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (opaque, size=%lu) 0x%lx>",
@@ -53,9 +53,9 @@ print_opaque (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 }
 
 static size_t
-sizeof_opaque (CONST void *header)
+sizeof_opaque (const void *header)
 {
-  CONST Lisp_Opaque *p = (CONST Lisp_Opaque *) header;
+  const Lisp_Opaque *p = (const Lisp_Opaque *) header;
   return offsetof (Lisp_Opaque, data) + p->size;
 }
 
@@ -64,7 +64,7 @@ sizeof_opaque (CONST void *header)
    If DATA is OPAQUE_UNINIT, the object's data is uninitialized.
    Else the object's data is initialized by copying from DATA. */
 Lisp_Object
-make_opaque (CONST void *data, size_t size)
+make_opaque (const void *data, size_t size)
 {
   Lisp_Opaque *p = (Lisp_Opaque *)
     alloc_lcrecord (offsetof (Lisp_Opaque, data) + size, &lrecord_opaque);
@@ -121,10 +121,10 @@ DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("opaque", opaque,
 static void
 print_opaque_ptr (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
-  CONST Lisp_Opaque_Ptr *p = XOPAQUE_PTR (obj);
+  const Lisp_Opaque_Ptr *p = XOPAQUE_PTR (obj);
   char buf[200];
 
-  sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (opaque_ptr, adr=0x%lx) 0x%lx>",
+  sprintf (buf, "#<INTERNAL OBJECT (XEmacs bug?) (opaque-ptr, adr=0x%lx) 0x%lx>",
 	   (long)(p->ptr), (unsigned long) p);
   write_c_string (buf, printcharfun);
 }
@@ -141,7 +141,7 @@ hash_opaque_ptr (Lisp_Object obj, int depth)
   return (unsigned long) XOPAQUE_PTR (obj)->ptr;
 }
 
-DEFINE_LRECORD_IMPLEMENTATION ("opaque_ptr", opaque_ptr,
+DEFINE_LRECORD_IMPLEMENTATION ("opaque-ptr", opaque_ptr,
 			       0, print_opaque_ptr, 0,
 			       equal_opaque_ptr, hash_opaque_ptr, 0,
 			       Lisp_Opaque_Ptr);
@@ -173,5 +173,8 @@ reinit_opaque_once_early (void)
 void
 init_opaque_once_early (void)
 {
+  INIT_LRECORD_IMPLEMENTATION (opaque);
+  INIT_LRECORD_IMPLEMENTATION (opaque_ptr);
+
   reinit_opaque_once_early ();
 }