X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Flisp-union.h;h=e85366832efa110ce444a4bb540b5c72f25a7dbb;hb=19f04fdab69808616555f472841ef9125d1df472;hp=4a49f8f57060d0e3cba9534ea0b377502aadb28d;hpb=2fd9701a4f902054649dde9143a3f77809afee8f;p=chise%2Fxemacs-chise.git.1 diff --git a/src/lisp-union.h b/src/lisp-union.h index 4a49f8f..e853668 100644 --- a/src/lisp-union.h +++ b/src/lisp-union.h @@ -30,7 +30,7 @@ typedef union Lisp_Object { /* if non-valbits are at lower addresses */ -#if defined(WORDS_BIGENDIAN) +#ifdef WORDS_BIGENDIAN struct { EMACS_UINT val : VALBITS; @@ -94,7 +94,7 @@ Lisp_Object; xset_var->gu.type = Lisp_Type_Char; \ xset_var->gu.val = xset_value; \ } while (0) -# define XSETOBJ(var, vartype, value) do { \ +# define XSETOBJ(var, value) do { \ EMACS_UINT xset_value = (EMACS_UINT) (value); \ (var).ui = xset_value; \ } while (0) @@ -105,7 +105,7 @@ INLINE_HEADER Lisp_Object make_int (EMACS_INT val) { Lisp_Object obj; - XSETINT(obj, val); + XSETINT (obj, val); return obj; } @@ -114,7 +114,16 @@ INLINE_HEADER Lisp_Object make_char (Emchar val) { Lisp_Object obj; - XSETCHAR(obj, val); + XSETCHAR (obj, val); + return obj; +} + +INLINE_HEADER Lisp_Object wrap_object (void *ptr); +INLINE_HEADER Lisp_Object +wrap_object (void *ptr) +{ + Lisp_Object obj; + XSETOBJ (obj, ptr); return obj; }