Merge pull request #532 from dubek/vhdl-fix-defmacro