Some fixes for MS_VC.

svn path=/trunk/; revision=11092

diff --git a/reactos/tools/mkconfig.c b/reactos/tools/mkconfig.c
index 3e92a86..73806e0 100644 (file)
--- a/reactos/tools/mkconfig.c
+++ b/reactos/tools/mkconfig.c
@@ -2,7 +2,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifndef max
 #define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
 int
 write_if_change(char* outbuf, char* filename)

diff --git a/reactos/tools/rcopy.c b/reactos/tools/rcopy.c
index 343c7f3..a02b8c7 100644 (file)
--- a/reactos/tools/rcopy.c
+++ b/reactos/tools/rcopy.c
@@ -13,10 +13,10 @@
 #include <unistd.h>
 #include <string.h>
 #endif
-#ifndef WIN32
 #ifndef MAX_PATH
 #define MAX_PATH 260
 #endif
+#ifndef WIN32
 #define DIR_SEPARATOR_CHAR '/'
 #define DIR_SEPARATOR_STRING "/"
 #else

diff --git a/reactos/tools/regtests.c b/reactos/tools/regtests.c
index 9cdd83b..14921ea 100755 (executable)
--- a/reactos/tools/regtests.c
+++ b/reactos/tools/regtests.c
@@ -21,10 +21,10 @@
 #include <unistd.h>
 #endif
 #include <ctype.h>
-#ifndef WIN32
 #ifndef MAX_PATH
 #define MAX_PATH 260
 #endif
+#ifndef WIN32
 #define DIR_SEPARATOR_CHAR '/'
 #define DIR_SEPARATOR_STRING "/"
 #else