commit of wrong sources from outdate repository. Fixes to compile under Xcode 5.02 and 64bit.