Build with Visual Studio 2012 It's more aggressive about enforcing that keywords are not macros in C++ mode, and has bumped the MFC version to 11. Keep compatibility with older versions of Visual Studio, appropriately conditionalized. (cherry picked from commit 7bca89626e53f258397818a9b0d838a0a3e00f5b) https://github.com/krb5/krb5/commit/6bbf1247d6a372849c39f258af77d0d71a81a4d7 Author: Ben Kaduk Committer: Tom Yu Commit: 6bbf1247d6a372849c39f258af77d0d71a81a4d7 Branch: krb5-1.11 src/include/win-mac.h | 4 +++- src/windows/leash/Makefile.in | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletions(-)