Hopefully fix build on Sun Studio.
4 files changed