Make module cleanly compile on Solaris 11 by Oracle Solaris Studio

Can you please incorporate attached changes for (allmost) clean compile of this module on Solaris OS?