|
From: <sv...@va...> - 2006-10-01 17:26:54
|
Author: sewardj
Date: 2006-10-01 18:26:50 +0100 (Sun, 01 Oct 2006)
New Revision: 6121
Log:
Don't define uchar; it might already be defined.
Modified:
branches/AIX5/perf/bz2.c
Modified: branches/AIX5/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
--- branches/AIX5/perf/bz2.c 2006-10-01 17:23:57 UTC (rev 6120)
+++ branches/AIX5/perf/bz2.c 2006-10-01 17:26:50 UTC (rev 6121)
@@ -5946,7 +5946,7 @@
=20
#define M_BLOCK 1000000
=20
-typedef unsigned char uchar;
+//typedef unsigned char UChar;
=20
#define M_BLOCK_OUT (M_BLOCK + 1000000)
char inbuf[M_BLOCK];
@@ -5981,7 +5981,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;
|