* m/att3b.h (XINT): Don't define.

(VALBITS, VALMASK, XTYPE): Deleted.
(DATA_SEG_BITS): Define.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/m/att3b.h b/src/m/att3b.h
index 4d9aab7e6bb..ed5f3c53dc9 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -106,24 +106,25 @@ Boston, MA 02111-1307, USA.  */
 
 #define NBPC 2048
 
+#if 0 /* If this is still needed, don't hard-code assumptions about
+         the number of VALBITS, or other assumptions about the
+         Lisp_Object representation.  Try to extend lisp.h instead, if
+         necessary.  */
 /* The usual definition of XINT, which involves shifting, does not
    sign-extend properly on this machine.  */
 
 #define XINT(i) (((sign_extend_temp=(i)) & 0x00800000) \
                  ? (sign_extend_temp | 0xFF000000) \
                  : (sign_extend_temp & 0x00FFFFFF))
+#endif
 
 #ifdef emacs /* Don't do this when making xmakefile! */
 extern int sign_extend_temp;
 #endif
 
 #if u3b2 || u3b5 || u3b15
-
 /* On 3b2/5/15, data space has high order bit on. */
-#define VALBITS 27
-#define VALMASK (((1<<VALBITS) - 1) | (1 << 31))
-#define XTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & GCTYPEMASK))
-
+#define DATA_SEG_BITS 0x80000000
 #endif /* 3b2, 3b5 or 3b15 */
 
 #define TEXT_START 0