diff options
| -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 @@ +2011-05-23 Paul Eggert <eggert@cs.ucla.edu> + + * 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. + 2011-05-22 Paul Eggert <eggert@cs.ucla.edu> 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); #define EXCEEDS_LISP_PTR(ptr) 0 #elif defined DATA_SEG_BITS #define EXCEEDS_LISP_PTR(ptr) \ - (((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS) + (((uintptr_t) (ptr) & ~DATA_SEG_BITS) >> VALBITS) #else -#define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS) +#define EXCEEDS_LISP_PTR(ptr) ((uintptr_t) (ptr) >> VALBITS) #endif - |