From a7116b25de5daebfda28243b64c5c1b4e357fc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 28 Mar 2014 01:05:55 +0000 Subject: [PATCH] [CMLIB][MKHIVE] (For host tools compilation only) Refine the #ifndefs, because SAL v2 annotations do not exist in MSVC < 2010. svn path=/trunk/; revision=62571 --- reactos/lib/cmlib/cmlib.h | 2 +- reactos/tools/mkhive/mkhive.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h index 4ea82bca508..d1b7af8dd62 100644 --- a/reactos/lib/cmlib/cmlib.h +++ b/reactos/lib/cmlib/cmlib.h @@ -23,7 +23,7 @@ #define strcasecmp _stricmp #endif//_WIN32 - #ifndef _MSC_VER + #if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1600))) #define _In_ #define _Out_ #define _Inout_ diff --git a/reactos/tools/mkhive/mkhive.h b/reactos/tools/mkhive/mkhive.h index ecb4463697e..293a464a694 100644 --- a/reactos/tools/mkhive/mkhive.h +++ b/reactos/tools/mkhive/mkhive.h @@ -130,12 +130,13 @@ extern LIST_ENTRY CmiHiveListHead; #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -#ifndef _MSC_VER +#if (!defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1600))) #define _In_ #define _Out_ #define _In_opt_ #define _In_range_(x, y) #endif + #define __drv_aliasesMem /* EOF */