1 files changed, 6 insertions, 14 deletions

diff --git a/src/lisp.h b/src/lisp.h
index b6ae2dcd073..7c3c1f3780e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -267,7 +267,9 @@ union Lisp_Object
 
     struct
       {
-        EMACS_INT val  : VALBITS;
+        /* Use explict signed, the signedness of a bit-field of type
+           int is implementation defined.  */
+        signed EMACS_INT val  : VALBITS;
         enum Lisp_Type type : GCTYPEBITS;
       } s;
     struct
@@ -290,7 +292,9 @@ union Lisp_Object
     struct
       {
         enum Lisp_Type type : GCTYPEBITS;
-        EMACS_INT val  : VALBITS;
+        /* Use explict signed, the signedness of a bit-field of type
+           int is implementation defined.  */
+        signed EMACS_INT val  : VALBITS;
       } s;
     struct
       {
@@ -447,20 +451,8 @@ enum pvec_type
 #endif
 
 #define XHASH(a) ((a).i)
-
 #define XTYPE(a) ((enum Lisp_Type) (a).u.type)
-
-#ifdef EXPLICIT_SIGN_EXTEND
-/* Make sure we sign-extend; compilers have been known to fail to do so.
-   We additionally cast to EMACS_INT since it seems that some compilers
-   have been known to fail to do so, even though the bitfield is declared
-   as EMACS_INT already.  */
-#define XINT(a) ((((EMACS_INT) (a).s.val) << (BITS_PER_EMACS_INT - VALBITS)) \
-                 >> (BITS_PER_EMACS_INT - VALBITS))
-#else
 #define XINT(a) ((a).s.val)
-#endif /* EXPLICIT_SIGN_EXTEND */
-
 #define XUINT(a) ((a).u.val)
 
 #ifdef USE_LSB_TAG