tree ce9c4073ea3efee578fd6920e157ccb7360f8057
parent 1383bdd9919ad3e86eb142c05eae5b156eaa8122
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> 1161048687 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> 1161048687 +0000

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