[hbelusca] 62592: [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).

Author: hbelusca
Date: Mon Mar 31 20:05:44 2014
New Revision: 62592

URL: http://svn.reactos.org/svn/reactos?rev=62592&view=rev
Log:
[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).

Modified:
    trunk/reactos/lib/cmlib/cmlib.h
    trunk/reactos/tools/mkhive/mkhive.h

Modified: trunk/reactos/lib/cmlib/cmlib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6259…
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/cmlib.h	[iso-8859-1] Mon Mar 31 20:05:44 2014
@@ -27,11 +27,19 @@
     #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

Modified: trunk/reactos/tools/mkhive/mkhive.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=…
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.h	[iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/mkhive.h	[iso-8859-1] Mon Mar 31 20:05:44 2014
@@ -122,21 +122,4 @@
 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 */