diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-10-31 02:34:16 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-10-31 02:34:16 +0000 |
| commit | bc86915f966235c7d6cc0a9b4f7a85c108d9dc7d (patch) | |
| tree | 04f9ae6e0b7182c65e72dad124d83c684a17a92b /src/data.c | |
| parent | 2067568b3583007f03440ae32825e93bfaa76d44 (diff) | |
| download | emacs-bc86915f966235c7d6cc0a9b4f7a85c108d9dc7d.tar.gz | |
(BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Rename from SHORTBITS, INTBITS, LONGBITS.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/data.c b/src/data.c index 53e40c11cef..3394cdb147c 100644 --- a/src/data.c +++ b/src/data.c @@ -31,13 +31,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "syssignal.h" -#ifdef MSDOS -/* These are redefined (correctly, but differently) in values.h. */ -#undef INTBITS -#undef LONGBITS -#undef SHORTBITS -#endif - #ifdef LISP_FLOAT_TYPE #ifdef STDC_HEADERS @@ -1532,13 +1525,12 @@ or a byte-code object. INDEX starts at 0.") else if (BOOL_VECTOR_P (array)) { int val; - int bits_per_char = INTBITS / sizeof (int); if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) args_out_of_range (array, idx); - val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / bits_per_char]; - return (val & (1 << (idxval % bits_per_char)) ? Qt : Qnil); + val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR]; + return (val & (1 << (idxval % BITS_PER_CHAR)) ? Qt : Qnil); } else if (CHAR_TABLE_P (array)) { @@ -1639,18 +1631,17 @@ ARRAY may be a vector or a string. IDX starts at 0.") else if (BOOL_VECTOR_P (array)) { int val; - int bits_per_char = INTBITS / sizeof (int); if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) args_out_of_range (array, idx); - val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / bits_per_char]; + val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR]; if (! NILP (newelt)) - val |= 1 << (idxval % bits_per_char); + val |= 1 << (idxval % BITS_PER_CHAR); else - val &= ~(1 << (idxval % bits_per_char)); - XBOOL_VECTOR (array)->data[idxval / bits_per_char] = val; + val &= ~(1 << (idxval % BITS_PER_CHAR)); + XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR] = val; } else if (CHAR_TABLE_P (array)) { |