[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

diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h
index 4ea82bc..d1b7af8 100644 (file)
--- 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 ecb4463..293a464 100644 (file)
--- 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 */