Attempt at fixing the MAX_PATH multiple definition problem.

include/toolhelp.h

@@ -6,9 +6,7 @@
 
 #define MAX_DATA	11
 #define MAX_MODULE_NAME	9
-#ifndef MAX_PATH
-#define MAX_PATH	255
-#endif
+#define MAX_PATH16	255
 #define MAX_CLASSNAME	255
 
 #pragma pack(1)
@@ -206,7 +204,7 @@ typedef struct
     char       szModule[MAX_MODULE_NAME + 1];
     HMODULE16  hModule;
     WORD       wcUsage;
-    char       szExePath[MAX_PATH + 1];
+    char       szExePath[MAX_PATH16 + 1];
     HANDLE16   wNext;
 } MODULEENTRY, *LPMODULEENTRY;
 

include/windows.h

@@ -12,14 +12,10 @@ extern "C" {
 #include "wintypes.h"
 #include "winbase.h"  
 
-/* FIXME: Maybe MAX_PATH and _MAX_PATH should be computed from the Unix headers instead
- * and by the way, _MAX_PATH should be defined in stdlib.h and MAX_PATH in windef.h 
+/* FIXME: _MAX_PATH should be defined in stdlib.h and MAX_PATH in windef.h 
  * and mapiwin.h
  */
-#define _MAX_PATH 260
-#ifndef MAX_PATH
 #define MAX_PATH 260
-#endif
 
 #ifndef DONT_INCLUDE_WINGDI
 #include "winbase.h"