Changes for Solaris 9 build