Skip to content

W
wine-cw
Commit e27326a7 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Attempt at fixing the MAX_PATH multiple definition problem.

parent 4ff2a27c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
include/toolhelp.h
View file @ e27326a7
...@@ -6,9 +6,7 @@ ...@@ -6,9 +6,7 @@
#define MAX_DATA 11 #define MAX_DATA 11
#define MAX_MODULE_NAME 9 #define MAX_MODULE_NAME 9
#ifndef MAX_PATH #define MAX_PATH16 255
#define MAX_PATH 255
#endif
#define MAX_CLASSNAME 255 #define MAX_CLASSNAME 255
#pragma pack(1) #pragma pack(1)
...@@ -206,7 +204,7 @@ typedef struct ...@@ -206,7 +204,7 @@ typedef struct
char szModule[MAX_MODULE_NAME + 1]; char szModule[MAX_MODULE_NAME + 1];
HMODULE16 hModule; HMODULE16 hModule;
WORD wcUsage; WORD wcUsage;
char szExePath[MAX_PATH + 1]; char szExePath[MAX_PATH16 + 1];
HANDLE16 wNext; HANDLE16 wNext;
} MODULEENTRY, *LPMODULEENTRY; } MODULEENTRY, *LPMODULEENTRY;
......
include/windows.h
View file @ e27326a7
...@@ -12,14 +12,10 @@ extern "C" { ...@@ -12,14 +12,10 @@ extern "C" {
#include "wintypes.h" #include "wintypes.h"
#include "winbase.h" #include "winbase.h"
/* FIXME: Maybe MAX_PATH and _MAX_PATH should be computed from the Unix headers instead /* FIXME: _MAX_PATH should be defined in stdlib.h and MAX_PATH in windef.h
* and by the way, _MAX_PATH should be defined in stdlib.h and MAX_PATH in windef.h
* and mapiwin.h * and mapiwin.h
*/ */
#define _MAX_PATH 260
#ifndef MAX_PATH
#define MAX_PATH 260 #define MAX_PATH 260
#endif
#ifndef DONT_INCLUDE_WINGDI #ifndef DONT_INCLUDE_WINGDI
#include "winbase.h" #include "winbase.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment