[27830] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.11]: Build with Visual Studio 2012
daemon@ATHENA.MIT.EDU (Tom Yu)
Mon Jul 1 15:55:54 2013
Date: Mon, 1 Jul 2013 15:55:49 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201307011955.r61Jtn9B022566@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/6bbf1247d6a372849c39f258af77d0d71a81a4d7
commit 6bbf1247d6a372849c39f258af77d0d71a81a4d7
Author: Ben Kaduk <kaduk@mit.edu>
Date: Mon Jun 24 18:19:45 2013 -0400
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)
ticket: 7664
version_fixed: 1.11.4
status: resolved
src/include/win-mac.h | 4 +++-
src/windows/leash/Makefile.in | 9 +++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index daec295..2d8090a 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
diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index ec8cfa0..28815f0 100644
--- a/src/windows/leash/Makefile.in
+++ b/src/windows/leash/Makefile.in
@@ -14,11 +14,20 @@ AFS_INCLUDES=
AFS_LIBS=
!endif
+# Need MFC version 11 for VS 2012; older VS get MFC version 10
+!if defined(VISUALSTUDIOVERSION) && "$(VISUALSTUDIOVERSION)" == "11.0"
+!if defined(NODEBUG)
+MFCLIB=MFC110.LIB
+!else
+MFCLIB=MFC110D.LIB
+!endif
+!else
!if defined(NODEBUG)
MFCLIB=MFC100.LIB
!else
MFCLIB=MFC100D.LIB
!endif
+!endif
EXE_NAME=leash
WSHELPER=wshelp32
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
