[ros-dev] [ros-diffs] [akhaldi] 63353: [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.

[Thomas Faber]

Hrm, why not just limit the define to C instead?


On 2014-05-18 16:39, akhaldi at svn.reactos.org wrote:
> Author: akhaldi
> Date: Sun May 18 14:39:03 2014
> New Revision: 63353
> 
> URL: http://svn.reactos.org/svn/reactos?rev=63353&view=rev
> Log:
> [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.
> 
> Modified:
>     trunk/reactos/CMakeLists.txt
> 
> Modified: trunk/reactos/CMakeLists.txt
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=63353&r1=63352&r2=63353&view=diff
> ==============================================================================
> --- trunk/reactos/CMakeLists.txt	[iso-8859-1] (original)
> +++ trunk/reactos/CMakeLists.txt	[iso-8859-1] Sun May 18 14:39:03 2014
> @@ -62,6 +62,9 @@
>      if(MSVC)
>          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()
> 
>