diff options
| author | Tom Lane | 2000-08-26 21:53:44 +0000 |
|---|---|---|
| committer | Tom Lane | 2000-08-26 21:53:44 +0000 |
| commit | d70bf0dd35544eba874007a9edc3ec08e047ef97 (patch) | |
| tree | 2fd61e491850b15e3e2e07e3d55f58a2540d69f4 /src/include/utils | |
| parent | 662f6a557cbcaf977cdd8b58bc627ac2a8aa82d5 (diff) | |
Rename BITSPERBYTE to BITS_PER_BYTE to avoid conflict with <values.h>
on some platforms.
Diffstat (limited to 'src/include/utils')
| -rw-r--r-- | src/include/utils/varbit.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h index e3ff9a8efb4..ed3710ddf70 100644 --- a/src/include/utils/varbit.h +++ b/src/include/utils/varbit.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: varbit.h,v 1.6 2000/08/21 04:48:54 tgl Exp $ + * $Id: varbit.h,v 1.7 2000/08/26 21:53:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -49,13 +49,13 @@ typedef struct /* Number of bytes in the data section of a bit string */ #define VARBITBYTES(PTR) (VARSIZE(PTR) - VARHDRSZ - VARBITHDRSZ) /* Padding of the bit string at the end (in bits) */ -#define VARBITPAD(PTR) (VARBITBYTES(PTR)*BITSPERBYTE - VARBITLEN(PTR)) +#define VARBITPAD(PTR) (VARBITBYTES(PTR)*BITS_PER_BYTE - VARBITLEN(PTR)) /* Number of bytes needed to store a bit string of a given length */ -#define VARBITTOTALLEN(BITLEN) (((BITLEN) + BITSPERBYTE-1)/BITSPERBYTE + \ +#define VARBITTOTALLEN(BITLEN) (((BITLEN) + BITS_PER_BYTE-1)/BITS_PER_BYTE + \ VARHDRSZ + VARBITHDRSZ) /* pointer beyond the end of the bit string (like end() in STL containers) */ #define VARBITEND(PTR) (((bits8 *) (PTR)) + VARSIZE(PTR)) -/* Mask that will cover exactly one byte, i.e. BITSPERBYTE bits */ +/* Mask that will cover exactly one byte, i.e. BITS_PER_BYTE bits */ #define BITMASK 0xFF #define BITHIGH 0x80 |