Use typedefs64.h in wmc instead of defining the types in the Makefile.

The definition of wchar_t can also be removed as this type is defined in windef.h if it was not defined before.

svn path=/trunk/; revision=28395

diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak
index 1709197..fa38003 100644 (file)
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -32,10 +32,6 @@ WMC_OBJECTS = \
 
 WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \
                   -D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \
-                  -DDWORD="unsigned int" -DDWORD_DEFINED \
-                  -DLONG="int" -DULONG="unsigned int" \
-                  -DPULONG="unsigned int *" -DLONG_DEFINED \
-                  -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \
                   -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk
 
 WMC_HOST_LFLAGS = $(TOOLS_LFLAGS)

diff --git a/reactos/tools/wmc/wmctypes.h b/reactos/tools/wmc/wmctypes.h
index 2f8e02a..09c1b7d 100644 (file)
--- a/reactos/tools/wmc/wmctypes.h
+++ b/reactos/tools/wmc/wmctypes.h
@@ -22,6 +22,7 @@
 #define __WMC_WMCTYPES_H
 
 #include <stdarg.h>
+#include <typedefs64.h>
 #include "windef.h"
 #include "winbase.h"