RE: 21.5 build failures on SunOS-5.5 and 5.8