More OSHMEM fixes for Sun C 5.12 compiler