X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fopaque.h;h=d308eb09d3cf0d0ac98644526ebf39c8f5620ed6;hb=09b372c3074a7cc339a61b2297583f2b9edefe86;hp=542068164c9528fe699fa77935f4a7e0e906b648;hpb=716cfba952c1dc0d2cf5c968971f3780ba728a89;p=chise%2Fxemacs-chise.git.1

diff --git a/src/opaque.h b/src/opaque.h
index 5420681..d308eb0 100644
--- a/src/opaque.h
+++ b/src/opaque.h
@@ -26,12 +26,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef INCLUDED_opaque_h_
 #define INCLUDED_opaque_h_
 
-typedef union {
-  struct { Lisp_Object obj; } obj;
-  struct { void *p; } p;
-  struct { double d; } d;
-} max_align_t;
-
 typedef struct Lisp_Opaque
 {
   struct lcrecord_header header;
@@ -48,17 +42,15 @@ DECLARE_LRECORD (opaque, Lisp_Opaque);
    functions should not be doing this. */
 
 /* Alternative DATA arguments to make_opaque() */
-#define OPAQUE_CLEAR  ((CONST void *)  0)
-#define OPAQUE_UNINIT ((CONST void *) -1)
+#define OPAQUE_CLEAR  ((const void *)  0)
+#define OPAQUE_UNINIT ((const void *) -1)
 
 #define OPAQUE_SIZE(op) ((op)->size)
 #define OPAQUE_DATA(op) ((void *) ((op)->data))
-#define OPAQUE_MARKFUN(op) ((op)->markfun)
 #define XOPAQUE_SIZE(op) OPAQUE_SIZE (XOPAQUE (op))
 #define XOPAQUE_DATA(op) OPAQUE_DATA (XOPAQUE (op))
-#define XOPAQUE_MARKFUN(op) OPAQUE_MARKFUN (XOPAQUE (op))
 
-Lisp_Object make_opaque (CONST void *data, size_t size);
+Lisp_Object make_opaque (const void *data, size_t size);
 
 typedef struct Lisp_Opaque_Ptr
 {