|
From: <sv...@va...> - 2006-10-17 01:31:30
|
Author: sewardj
Date: 2006-10-17 02:31:27 +0100 (Tue, 17 Oct 2006)
New Revision: 6260
Log:
Merge r6121: Don't define uchar; it might already be defined.
Modified:
trunk/perf/bz2.c
Modified: trunk/perf/bz2.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/perf/bz2.c 2006-10-17 01:30:47 UTC (rev 6259)
+++ trunk/perf/bz2.c 2006-10-17 01:31:27 UTC (rev 6260)
@@ -5946,7 +5946,6 @@
=20
#define M_BLOCK 1000000
=20
-typedef unsigned char uchar;
=20
#define M_BLOCK_OUT (M_BLOCK + 1000000)
char inbuf[M_BLOCK];
@@ -5981,7 +5980,7 @@
{
int byteno =3D bit / 8;
int bitno =3D bit % 8;
- uchar mask =3D 1 << bitno;
+ UChar mask =3D 1 << bitno;
//fprintf ( stderr, "(byte %d bit %d mask %d)",
// byteno, bitno, (int)mask );
zbuf[byteno] ^=3D mask;
|