sun cc will build fail, just offer two patches to let sun cc build pass.