Adaptations for clang.

svn path=/sandbox/; revision=83223