From: Dan Nicolaescu Date: Fri, 20 Aug 2010 22:52:10 +0000 (-0700) Subject: Small src/puresize.h cleanup. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~511^2~21 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=748155880fc11549ab230b74e2cb2d03a4965630;p=emacs.git Small src/puresize.h cleanup. * src/puresize.h: Remove code assuming PNTR_COMPARISON_TYPE is not defined, unconditionally defined in lisp.h. --- diff --git a/src/ChangeLog b/src/ChangeLog index 2c51aeb6ce7..2150e4d3fac 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-08-20 Dan Nicolaescu + * puresize.h: Remove code assuming PNTR_COMPARISON_TYPE is not + defined, unconditionally defined in lisp.h. + * term.c: Do not include , systty.h does it. * s/unixware.h (HAVE_TCATTR): diff --git a/src/puresize.h b/src/puresize.h index 682e8926135..3c7f92228a0 100644 --- a/src/puresize.h +++ b/src/puresize.h @@ -87,7 +87,6 @@ extern EMACS_INT pure[]; && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) #else /* not VIRT_ADDR_VARIES */ -#ifdef PNTR_COMPARISON_TYPE /* When PNTR_COMPARISON_TYPE is not the default (unsigned int). */ extern char my_edata[]; @@ -95,14 +94,6 @@ extern char my_edata[]; #define PURE_P(obj) \ ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata) -#else /* not VIRT_ADDRESS_VARIES, not PNTR_COMPARISON_TYPE */ - -extern char my_edata[]; - -#define PURE_P(obj) \ - (XPNTR (obj) < (unsigned int) my_edata) - -#endif /* PNTR_COMPARISON_TYPE */ #endif /* VIRT_ADDRESS_VARIES */ /* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f