Try to fix Solaris wclear macro build breakage