diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/puresize.h | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/puresize.h')
| -rw-r--r-- | src/puresize.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/puresize.h b/src/puresize.h index a1b7007805b..889d836af78 100644 --- a/src/puresize.h +++ b/src/puresize.h | |||
| @@ -79,21 +79,7 @@ extern void pure_write_error (void) NO_RETURN; | |||
| 79 | 79 | ||
| 80 | /* Define PURE_P. */ | 80 | /* Define PURE_P. */ |
| 81 | 81 | ||
| 82 | #ifdef VIRT_ADDR_VARIES | ||
| 83 | /* For machines where text and data can go anywhere | ||
| 84 | in virtual memory. */ | ||
| 85 | |||
| 86 | extern EMACS_INT pure[]; | 82 | extern EMACS_INT pure[]; |
| 87 | 83 | ||
| 88 | #define PURE_P(obj) \ | 84 | #define PURE_P(obj) \ |
| 89 | ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \ | 85 | ((uintptr_t) XPNTR (obj) - (uintptr_t) pure <= PURESIZE) |
| 90 | && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) | ||
| 91 | |||
| 92 | #else /* not VIRT_ADDR_VARIES */ | ||
| 93 | |||
| 94 | extern char my_edata[]; | ||
| 95 | |||
| 96 | #define PURE_P(obj) \ | ||
| 97 | ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata) | ||
| 98 | |||
| 99 | #endif /* VIRT_ADDRESS_VARIES */ | ||