Waldemar Brodkorb e1e46622ac Revert "resolve merge" 9 lat temu
..
libc-lock.h e1e46622ac Revert "resolve merge" 9 lat temu
libc-tsd.h e1e46622ac Revert "resolve merge" 9 lat temu
pthreadtypes.h e1e46622ac Revert "resolve merge" 9 lat temu