Seems to work to change it to just "#define short", but I guess that'll break in older bisons instead.
(I also tried "#define short signed" since "signed" works both when followed by "int" and when not, but there were some "unsigned short int" in there.)