Merge pull request #694 from lioncash/interp-defines Core: Remove defines used to work around an MSVC 2005 bug