projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(put_char_table): Modify for `charset_code_point'.
[chise/xemacs-chise.git]
/
src
/
lisp-union.h
diff --git
a/src/lisp-union.h
b/src/lisp-union.h
index
54088cf
..
e853668
100644
(file)
--- 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 */
union Lisp_Object
{
/* if non-valbits are at lower addresses */
-#if defined(WORDS_BIGENDIAN)
+#ifdef WORDS_BIGENDIAN
struct
{
EMACS_UINT val : VALBITS;
struct
{
EMACS_UINT val : VALBITS;
@@
-76,7
+76,7
@@
union Lisp_Object
GCC to accept any (yes, any) pointer as the argument of
a function declared to accept a Lisp_Object. */
struct nosuchstruct *v;
GCC to accept any (yes, any) pointer as the argument of
a function declared to accept a Lisp_Object. */
struct nosuchstruct *v;
- CONST struct nosuchstruct *cv;
+ const struct nosuchstruct *cv;
}
Lisp_Object;
}
Lisp_Object;
@@
-94,27
+94,36
@@
Lisp_Object;
xset_var->gu.type = Lisp_Type_Char; \
xset_var->gu.val = xset_value; \
} while (0)
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)
# define XPNTRVAL(x) ((x).ui)
EMACS_UINT xset_value = (EMACS_UINT) (value); \
(var).ui = xset_value; \
} while (0)
# define XPNTRVAL(x) ((x).ui)
-INLINE Lisp_Object make_int (EMACS_INT val);
-INLINE Lisp_Object
+INLINE_HEADER Lisp_Object make_int (EMACS_INT val);
+INLINE_HEADER Lisp_Object
make_int (EMACS_INT val)
{
Lisp_Object obj;
make_int (EMACS_INT val)
{
Lisp_Object obj;
- XSETINT(obj, val);
+ XSETINT (obj, val);
return obj;
}
return obj;
}
-INLINE Lisp_Object make_char (Emchar val);
-INLINE Lisp_Object
+INLINE_HEADER Lisp_Object make_char (Emchar val);
+INLINE_HEADER Lisp_Object
make_char (Emchar val)
{
Lisp_Object obj;
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;
}
return obj;
}
@@
-136,9
+145,9
@@
extern Lisp_Object Qnull_pointer, Qzero;
#define VOID_TO_LISP(larg,varg) \
((void) ((larg).v = (struct nosuchstruct *) (varg)))
#define CVOID_TO_LISP(larg,varg) \
#define VOID_TO_LISP(larg,varg) \
((void) ((larg).v = (struct nosuchstruct *) (varg)))
#define CVOID_TO_LISP(larg,varg) \
- ((void) ((larg).cv = (CONST struct nosuchstruct *) (varg)))
+ ((void) ((larg).cv = (const struct nosuchstruct *) (varg)))
#define LISP_TO_VOID(larg) ((void *) ((larg).v))
#define LISP_TO_VOID(larg) ((void *) ((larg).v))
-#define LISP_TO_CVOID(larg) ((CONST void *) ((larg).cv))
+#define LISP_TO_CVOID(larg) ((const void *) ((larg).cv))
/* Convert a Lisp_Object into something that can't be used as an
lvalue. Useful for type-checking. */
/* Convert a Lisp_Object into something that can't be used as an
lvalue. Useful for type-checking. */