Updated to build with clang under linux.