Make Charmonizer/Test.c safe to include.
Make Charmonizer/Test.c safe to include.

Use fully qualified names in Charmonizer/Test.c and remove the pound-define
for CHAZ_USE_SHORT_NAMES so that Test.c can be pound-included safely.

git-svn-id: 0e6074679e66e8f1cc73dfc755b08bab367f805b@1212796 13f79535-47bb-0310-9956-ffa450edef68

rbevers/lucy,rectang/lucy,rbevers/lucy,pombredanne/apache-lucy,rectang/lucy,nwellnhof/lucy,apache/lucy,apache/lucy,rectang/lucy,nwellnhof/lucy,kidaa/lucy,kidaa/lucy,pombredanne/apache-lucy,rectang/lucy,pombredanne/apache-lucy,pombredanne/apache-lucy,pombredanne/apache-lucy,kidaa/lucy,pombredanne/apache-lucy,rbevers/lucy,kidaa/lucy,apache/lucy,nwellnhof/lucy,rbevers/lucy,rectang/lucy,kidaa/lucy,rbevers/lucy,apache/lucy,rectang/lucy,pombredanne/apache-lucy,apache/lucy,apache/lucy,kidaa/lucy,apache/lucy,nwellnhof/lucy,nwellnhof/lucy,rbevers/lucy,nwellnhof/lucy,kidaa/lucy,rbevers/lucy,kidaa/lucy,rectang/lucy,nwellnhof/lucy