Fix things up for SunOS

svn path=/trunk/; revision=23