From ac454fae845059586c940695e4eca109162a96cb Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 18 May 2014 14:39:03 +0000 Subject: [PATCH] [CMAKE/MSVC] * Define _ALLOW_KEYWORD_MACROS to get the news MSVC toolchain to allow us to redefine inline (it became a keyword). Reported by David Quintana. svn path=/trunk/; revision=63353 --- reactos/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt index a6a48ac077b..894af650fb2 100644 --- a/reactos/CMakeLists.txt +++ b/reactos/CMakeLists.txt @@ -63,6 +63,9 @@ if(NOT CMAKE_CROSSCOMPILING) if(ARCH STREQUAL "i386") add_definitions(/D_X86_ /DWIN32 /D_WINDOWS) endif() + if(MSVC_VERSION GREATER 1799) + add_definitions(/D_ALLOW_KEYWORD_MACROS) + endif() add_definitions(/Dinline=__inline) else() add_compile_flags("-fshort-wchar -Wno-multichar") -- 2.17.1