Between 3 and 17 days from now, kdave/for-4.13-part1 will be in mainline,
and it causes a conflict resolvable by this patch.  Please squash it with
[3/4] of zstd.

Signed-off-by: Adam Borowski <kilobyte@angband.pl>