diff options
| author | Dan Nicolaescu | 2010-08-20 15:52:10 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-08-20 15:52:10 -0700 |
| commit | 748155880fc11549ab230b74e2cb2d03a4965630 (patch) | |
| tree | c4f27758ef29c1ebb179a08e613b0b62adf40be6 /src | |
| parent | f5817d1cb513506a25320349f8ef967c23187753 (diff) | |
| download | emacs-748155880fc11549ab230b74e2cb2d03a4965630.tar.gz emacs-748155880fc11549ab230b74e2cb2d03a4965630.zip | |
Small src/puresize.h cleanup.
* src/puresize.h: Remove code assuming PNTR_COMPARISON_TYPE is not
defined, unconditionally defined in lisp.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/puresize.h | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2c51aeb6ce7..2150e4d3fac 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-08-20 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-08-20 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * puresize.h: Remove code assuming PNTR_COMPARISON_TYPE is not | ||
| 4 | defined, unconditionally defined in lisp.h. | ||
| 5 | |||
| 3 | * term.c: Do not include <termios.h>, systty.h does it. | 6 | * term.c: Do not include <termios.h>, systty.h does it. |
| 4 | 7 | ||
| 5 | * s/unixware.h (HAVE_TCATTR): | 8 | * 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[]; | |||
| 87 | && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) | 87 | && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) |
| 88 | 88 | ||
| 89 | #else /* not VIRT_ADDR_VARIES */ | 89 | #else /* not VIRT_ADDR_VARIES */ |
| 90 | #ifdef PNTR_COMPARISON_TYPE | ||
| 91 | /* When PNTR_COMPARISON_TYPE is not the default (unsigned int). */ | 90 | /* When PNTR_COMPARISON_TYPE is not the default (unsigned int). */ |
| 92 | 91 | ||
| 93 | extern char my_edata[]; | 92 | extern char my_edata[]; |
| @@ -95,14 +94,6 @@ extern char my_edata[]; | |||
| 95 | #define PURE_P(obj) \ | 94 | #define PURE_P(obj) \ |
| 96 | ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata) | 95 | ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata) |
| 97 | 96 | ||
| 98 | #else /* not VIRT_ADDRESS_VARIES, not PNTR_COMPARISON_TYPE */ | ||
| 99 | |||
| 100 | extern char my_edata[]; | ||
| 101 | |||
| 102 | #define PURE_P(obj) \ | ||
| 103 | (XPNTR (obj) < (unsigned int) my_edata) | ||
| 104 | |||
| 105 | #endif /* PNTR_COMPARISON_TYPE */ | ||
| 106 | #endif /* VIRT_ADDRESS_VARIES */ | 97 | #endif /* VIRT_ADDRESS_VARIES */ |
| 107 | 98 | ||
| 108 | /* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f | 99 | /* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f |