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
1 file changed