Merge pull request #3685 from jkotas/ifdefs
authorJan Kotas <jkotas@microsoft.com>
Sun, 13 Mar 2016 21:55:50 +0000 (14:55 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sun, 13 Mar 2016 21:55:50 +0000 (14:55 -0700)
Fix ifdefs


Trivial merge