# HG changeset patch # User james # Date 1150476641 0 # Node ID 78507f684253acc03a97bdf19a715a0b53b76d4d # Parent 6c1040b85913a4cbeebd231e77a4497bf6de3658 [xemacs-hg @ 2006-06-16 16:50:39 by james] Cast away bit restrictions when using the union type. Fixes some gcc 4.1 compilation problems. diff -r 6c1040b85913 -r 78507f684253 src/ChangeLog --- a/src/ChangeLog Thu Jun 15 21:51:06 2006 +0000 +++ b/src/ChangeLog Fri Jun 16 16:50:41 2006 +0000 @@ -1,3 +1,8 @@ +2006-06-13 Jerry James + + * lisp-union.h: Cast away bit restrictions on values retrieved + from the Lisp_Object union. + 2006-06-14 Aidan Kehoe * mule-ccl.c: diff -r 6c1040b85913 -r 78507f684253 src/lisp-union.h --- a/src/lisp-union.h Thu Jun 15 21:51:06 2006 +0000 +++ b/src/lisp-union.h Fri Jun 16 16:50:41 2006 +0000 @@ -80,11 +80,11 @@ } Lisp_Object; -#define XCHARVAL(x) ((x).gu.val) +#define XCHARVAL(x) ((EMACS_INT)(x).gu.val) #define XPNTRVAL(x) ((x).ui) -#define XREALINT(x) ((x).s.val) -#define XUINT(x) ((x).u.val) +#define XREALINT(x) ((EMACS_INT)(x).s.val) +#define XUINT(x) ((EMACS_UINT)(x).u.val) #define XTYPE(x) ((x).gu.type) #define EQ(x,y) ((x).v == (y).v)