Merge r6121: Don't define uchar; it might already be defined.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6260

diff --git a/perf/bz2.c b/perf/bz2.c
index d1c58ef7a52ca0b1bdce314568925ab563c8409f..d28215c7d2f639a4770170e4d1725094dce46cb0 100644 (file)
--- a/perf/bz2.c
+++ b/perf/bz2.c
@@ -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;