Compilation fix for 21.4.3 --without-x