Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-41
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-42
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-43
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-44
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-45
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-46
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-47
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-48
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-14
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-15
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-16
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-17
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507

1 files changed, 5 insertions, 1 deletions

diff --git a/src/lisp.h b/src/lisp.h
index f04d29808d1..66dcdeb00da 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -484,7 +484,11 @@ extern size_t pure_size;
    in a Lisp object whose data type says it points to something.  */
 #define XPNTR(a) (XUINT (a) | DATA_SEG_BITS)
 #else
-#define XPNTR(a) XUINT (a)
+/* Some versions of gcc seem to consider the bitfield width when
+   issuing the "cast to pointer from integer of different size"
+   warning, so the cast is here to widen the value back to its natural
+   size.  */
+#define XPNTR(a) ((EMACS_INT) XUINT (a))
 #endif
 #endif /* not HAVE_SHM */
 #endif /* no XPNTR */