From 7bca89626e53f258397818a9b0d838a0a3e00f5b Mon Sep 17 00:00:00 2001
From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 24 Jun 2013 18:19:45 -0400
Subject: 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.

ticket: 7664 (new)
tags: pullup
target_version: 1.11.4
---
 src/include/win-mac.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/include/win-mac.h')

diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index daec295b2c..2d8090adbf 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -119,8 +119,10 @@ typedef _W64 int         ssize_t;
 #define NO_PASSWORD
 #define HAVE_STRERROR
 #define SYS_ERRLIST_DECLARED
-/* if __STDC_VERSION__ >= 199901L this shouldn't be needed */
+/* Visual Studio 2012 errors out when we macroize keywords in C++ mode */
+#ifndef __cplusplus
 #define inline __inline
+#endif
 #define NEED_INSIXADDR_ANY
 #define ENABLE_THREADS
 #endif
-- 
cgit