diff options
| author | Paul Eggert | 2011-05-22 17:22:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-22 17:22:43 -0700 |
| commit | fdccd48e6df31841616ae7a2d98f187e8a0c403c (patch) | |
| tree | 434102645e61acf3e0f18abc57e0b25423c45261 | |
| parent | af3d522ffbf83826f80ab8f6d811e19e97c37384 (diff) | |
| download | emacs-fdccd48e6df31841616ae7a2d98f187e8a0c403c.tar.gz emacs-fdccd48e6df31841616ae7a2d98f187e8a0c403c.zip | |
* mem-limits.h (EXCEEDS_LISP_PTR) [!USE_LSB_TAG]: EMACS_UINT -> uintptr_t
This follows up to the 2011-05-06 change that substituted uintptr_t
for EMACS_INT. This case wasn't caught back then.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/mem-limits.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 74f0bd52a5d..725c6642746 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-05-23 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * mem-limits.h (EXCEEDS_LISP_PTR) [!USE_LSB_TAG]: EMACS_UINT -> uintptr_t | ||
| 4 | This follows up to the 2011-05-06 change that substituted uintptr_t | ||
| 5 | for EMACS_INT. This case wasn't caught back then. | ||
| 6 | |||
| 1 | 2011-05-22 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2011-05-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | Rework Fformat to avoid integer overflow issues. | 9 | Rework Fformat to avoid integer overflow issues. |
diff --git a/src/mem-limits.h b/src/mem-limits.h index 09be61be52c..aa3a13c1c34 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h | |||
| @@ -40,8 +40,7 @@ extern char *start_of_data (void); | |||
| 40 | #define EXCEEDS_LISP_PTR(ptr) 0 | 40 | #define EXCEEDS_LISP_PTR(ptr) 0 |
| 41 | #elif defined DATA_SEG_BITS | 41 | #elif defined DATA_SEG_BITS |
| 42 | #define EXCEEDS_LISP_PTR(ptr) \ | 42 | #define EXCEEDS_LISP_PTR(ptr) \ |
| 43 | (((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS) | 43 | (((uintptr_t) (ptr) & ~DATA_SEG_BITS) >> VALBITS) |
| 44 | #else | 44 | #else |
| 45 | #define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS) | 45 | #define EXCEEDS_LISP_PTR(ptr) ((uintptr_t) (ptr) >> VALBITS) |
| 46 | #endif | 46 | #endif |
| 47 | |||