Mercurial > hg > xemacs-beta
diff src/opaque.c @ 442:abe6d1db359e r21-2-36
Import from CVS: tag r21-2-36
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:35:02 +0200 |
| parents | 8de8e3f6228a |
| children | e7ef97881643 |
line wrap: on
line diff
--- a/src/opaque.c Mon Aug 13 11:33:40 2007 +0200 +++ b/src/opaque.c Mon Aug 13 11:35:02 2007 +0200 @@ -44,7 +44,7 @@ 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 @@ } 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 @@ 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 @@ 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 @@ 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 @@ void init_opaque_once_early (void) { + INIT_LRECORD_IMPLEMENTATION (opaque); + INIT_LRECORD_IMPLEMENTATION (opaque_ptr); + reinit_opaque_once_early (); }