Waldemar Brodkorb e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
..
libc-lock.h e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
libc-tsd.h e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos
pthreadtypes.h e1e46622ac Revert "resolve merge" %!s(int64=9) %!d(string=hai) anos