Merge pull request #1687 from jasonwilliams200OK/__fastcall-Wmacro-redefined
authorJan Kotas <jkotas@microsoft.com>
Tue, 6 Oct 2015 22:39:44 +0000 (15:39 -0700)
committerJan Kotas <jkotas@microsoft.com>
Tue, 6 Oct 2015 22:39:44 +0000 (15:39 -0700)
code: Fix redefined macro warning


Trivial merge