diff options
| author | Andreas Schwab <schwab@suse.de> | 2004-04-26 21:28:40 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2004-04-26 21:28:40 +0000 |
| commit | d1ca81d9a8aaf60d46e3f8e4838b2dfd3831764d (patch) | |
| tree | 96f6c08bb428db63cddcf118ba560f0caef88c36 /src/lread.c | |
| parent | 4435a68af69eccce12ff5702d9d7ea38846648d1 (diff) | |
| download | emacs-d1ca81d9a8aaf60d46e3f8e4838b2dfd3831764d.tar.gz | |
(read1): Use BOOL_VECTOR_BITS_PER_CHAR instead of BITS_PER_CHAR for
bool vectors.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lread.c b/src/lread.c index 0910dda61cd..db83623e054 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1993,8 +1993,9 @@ read1 (readcharfun, pch, first_in_list) if (c == '"') { Lisp_Object tmp, val; - int size_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1) - / BITS_PER_CHAR); + int size_in_chars + = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1) + / BOOL_VECTOR_BITS_PER_CHAR); UNREAD (c); tmp = read1 (readcharfun, pch, first_in_list); @@ -2003,7 +2004,7 @@ read1 (readcharfun, pch, first_in_list) when the number of bits was a multiple of 8. Accept such input in case it came from an old version. */ && ! (XFASTINT (length) - == (SCHARS (tmp) - 1) * BITS_PER_CHAR)) + == (SCHARS (tmp) - 1) * BOOL_VECTOR_BITS_PER_CHAR)) Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5), Qnil)); @@ -2011,9 +2012,9 @@ read1 (readcharfun, pch, first_in_list) bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data, size_in_chars); /* Clear the extraneous bits in the last byte. */ - if (XINT (length) != size_in_chars * BITS_PER_CHAR) + if (XINT (length) != size_in_chars * BOOL_VECTOR_BITS_PER_CHAR) XBOOL_VECTOR (val)->data[size_in_chars - 1] - &= (1 << (XINT (length) % BITS_PER_CHAR)) - 1; + &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1; return val; } Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5), |