diff options
author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2006-10-17 01:31:27 +0000 |
---|---|---|
committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2006-10-17 01:31:27 +0000 |
commit | cd030b59fd308ea5450bb1209ba18efc4c84f295 (patch) | |
tree | ce9c4073ea3efee578fd6920e157ccb7360f8057 /perf | |
parent | 1383bdd9919ad3e86eb142c05eae5b156eaa8122 (diff) |
Merge r6121: Don't define uchar; it might already be defined.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6260 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'perf')
-rw-r--r-- | perf/bz2.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -5946,7 +5946,6 @@ const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum) #define M_BLOCK 1000000 -typedef unsigned char uchar; #define M_BLOCK_OUT (M_BLOCK + 1000000) char inbuf[M_BLOCK]; @@ -5981,7 +5980,7 @@ void flip_bit ( int bit ) { int byteno = bit / 8; int bitno = bit % 8; - uchar mask = 1 << bitno; + UChar mask = 1 << bitno; //fprintf ( stderr, "(byte %d bit %d mask %d)", // byteno, bitno, (int)mask ); zbuf[byteno] ^= mask; |