diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/mem-limits.h | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/mem-limits.h')
| -rw-r--r-- | src/mem-limits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem-limits.h b/src/mem-limits.h index 86b2f44846d..244592a9768 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Includes for memory limit warnings. | 1 | /* Includes for memory limit warnings. |
| 2 | Copyright (C) 1990, 1993-1996, 2001-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1990, 1993-1996, 2001-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -34,7 +34,7 @@ extern int etext; | |||
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | extern char *start_of_data (void); | 36 | extern char *start_of_data (void); |
| 37 | #if defined USE_LSB_TAG | 37 | #if defined USE_LSB_TAG || UINTPTR_MAX >> VALBITS == 0 |
| 38 | #define EXCEEDS_LISP_PTR(ptr) 0 | 38 | #define EXCEEDS_LISP_PTR(ptr) 0 |
| 39 | #elif defined DATA_SEG_BITS | 39 | #elif defined DATA_SEG_BITS |
| 40 | #define EXCEEDS_LISP_PTR(ptr) \ | 40 | #define EXCEEDS_LISP_PTR(ptr) \ |