From e2359b3724ce49375e4b96d030aa0bafab428b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Mon, 31 Mar 2014 20:05:44 +0000
Subject: [PATCH] [CMLIB][MKHIVE] Move some defines where they belong (they are
 used in mkhive because they are employed in cmlib functions, and cmlib itself
 uses them too).

svn path=/trunk/; revision=62592
---
 reactos/lib/cmlib/cmlib.h     |  8 ++++++++
 reactos/tools/mkhive/mkhive.h | 17 -----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h
index 0ddfabd3443..44221ec0bc7 100644
--- a/reactos/lib/cmlib/cmlib.h
+++ b/reactos/lib/cmlib/cmlib.h
@@ -27,12 +27,20 @@
     #define _In_
     #define _Out_
     #define _Inout_
+    #define _In_opt_
+    #define _In_range_(x, y)
     #endif
 
+    #define __drv_aliasesMem
+
     #ifndef min
     #define min(a, b)  (((a) < (b)) ? (a) : (b))
     #endif
 
+    // #ifndef max
+    // #define max(a, b)  (((a) > (b)) ? (a) : (b))
+    // #endif
+
     // Definitions copied from <ntstatus.h>
     // We only want to include host headers, so we define them manually
     #define STATUS_SUCCESS                   ((NTSTATUS)0x00000000)
diff --git a/reactos/tools/mkhive/mkhive.h b/reactos/tools/mkhive/mkhive.h
index 0cd9eb937a2..7ce3bb53fd9 100644
--- a/reactos/tools/mkhive/mkhive.h
+++ b/reactos/tools/mkhive/mkhive.h
@@ -122,21 +122,4 @@ RegOpenKeyW(
 extern LIST_ENTRY CmiHiveListHead;
 #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V))
 
-#ifndef max
-#define max(a, b)  (((a) > (b)) ? (a) : (b))
-#endif
-
-#ifndef min
-#define min(a, b)  (((a) < (b)) ? (a) : (b))
-#endif
-
-#if (!defined(_MSC_VER) || (_MSC_VER < 1500))
-#define _In_
-#define _Out_
-#define _In_opt_
-#define _In_range_(x, y)
-#endif
-
-#define __drv_aliasesMem
-
 /* EOF */