Patches for check_swap not build on UNIX [sf#1984255] [#908]