back out part of Paul's POSIX-96 patch to fix compile.