diff options
| author | Paul Eggert | 2014-04-16 12:43:46 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-04-16 12:43:46 -0700 |
| commit | 290d7ac277986bd118e594a8100b3f40e4492cb1 (patch) | |
| tree | d63a3aa61cac577dd119665edaffe2def8d194e2 /src/data.c | |
| parent | 37eccff4f72c5a36dcd4b89d417b0047aab84e50 (diff) | |
| parent | b262bde327db2cd9b2f01f2d3ed946d0b188cb9d (diff) | |
| download | emacs-290d7ac277986bd118e594a8100b3f40e4492cb1.tar.gz emacs-290d7ac277986bd118e594a8100b3f40e4492cb1.zip | |
Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data.c b/src/data.c index dd220987fd7..965ddd215f5 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -2987,7 +2987,7 @@ bool_vector_spare_mask (EMACS_INT nr_bits) | |||
| 2987 | /* Info about unsigned long long, falling back on unsigned long | 2987 | /* Info about unsigned long long, falling back on unsigned long |
| 2988 | if unsigned long long is not available. */ | 2988 | if unsigned long long is not available. */ |
| 2989 | 2989 | ||
| 2990 | #if HAVE_UNSIGNED_LONG_LONG_INT | 2990 | #if HAVE_UNSIGNED_LONG_LONG_INT && defined ULLONG_MAX |
| 2991 | enum { BITS_PER_ULL = CHAR_BIT * sizeof (unsigned long long) }; | 2991 | enum { BITS_PER_ULL = CHAR_BIT * sizeof (unsigned long long) }; |
| 2992 | # define ULL_MAX ULLONG_MAX | 2992 | # define ULL_MAX ULLONG_MAX |
| 2993 | #else | 2993 | #else |