Patched for building with bison-3 on -current. Signed-off-by: David Spencer <baildon.research@googlemail.com>