Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
src 981a6d49e9 fix compile with musl 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu