[ros-diffs] [cfinck] 31347: - Don't reinvent the wheel again: Use <host/typedefs.h> in winebuild instead of defining the types for the host manually again - Get rid of the "include/psdk" include directory in the winebuild makefile - Add a definition for UINT_PTR and PUINT_PTR to <host/typedefs.h>

[cfinck at svn.reactos.org]

Author: cfinck
Date: Thu Dec 20 03:20:01 2007
New Revision: 31347

URL: http://svn.reactos.org/svn/reactos?rev=31347&view=rev
Log:
- Don't reinvent the wheel again: Use <host/typedefs.h> in winebuild instead of defining the types for the host manually again
- Get rid of the "include/psdk" include directory in the winebuild makefile
- Add a definition for UINT_PTR and PUINT_PTR to <host/typedefs.h>

Modified:
    trunk/reactos/include/host/typedefs.h
    trunk/reactos/tools/winebuild/winebuild.mak
    trunk/reactos/tools/winebuild/winglue.h

Modified: trunk/reactos/include/host/typedefs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?rev=31347&r1=31346&r2=31347&view=diff
==============================================================================
--- trunk/reactos/include/host/typedefs.h (original)
+++ trunk/reactos/include/host/typedefs.h Thu Dec 20 03:20:01 2007
@@ -71,7 +71,7 @@
 typedef long long LONGLONG;
 typedef unsigned long long ULONGLONG;
 typedef int INT;
-typedef unsigned int UINT, *PUINT, *LPUINT;
+typedef unsigned int UINT, *PUINT, *LPUINT, UINT_PTR, *PUINT_PTR;
 typedef UCHAR BOOLEAN, *PBOOLEAN;
 typedef int BOOL;
 typedef long int W64 LONG_PTR, *PLONG_PTR;

Modified: trunk/reactos/tools/winebuild/winebuild.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.mak?rev=31347&r1=31346&r2=31347&view=diff
==============================================================================
--- trunk/reactos/tools/winebuild/winebuild.mak (original)
+++ trunk/reactos/tools/winebuild/winebuild.mak Thu Dec 20 03:20:01 2007
@@ -35,7 +35,7 @@
   $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o))
 
 WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API \
-                        -Iinclude/reactos/wine -Iinclude -Iinclude/reactos -Iinclude/psdk \
+                        -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \
                         -I$(INTERMEDIATE_)include
 
 WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)

Modified: trunk/reactos/tools/winebuild/winglue.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?rev=31347&r1=31346&r2=31347&view=diff
==============================================================================
--- trunk/reactos/tools/winebuild/winglue.h (original)
+++ trunk/reactos/tools/winebuild/winglue.h Thu Dec 20 03:20:01 2007
@@ -1,18 +1,7 @@
 #ifndef _WINGLUE_H
 #define _WINGLUE_H
 
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-typedef unsigned short WCHAR;
-#if defined(_WIN64)
-typedef unsigned __int64 UINT_PTR;
-#else
-typedef unsigned int UINT_PTR;
-#endif
-
-#define LOBYTE(w)	((BYTE)(w))
-#define HIBYTE(w)	((BYTE)(((WORD)(w)>>8)&0xFF))
+#include <host/typedefs.h>
 
 #define DLL_PROCESS_ATTACH 1
 #define DLL_PROCESS_DETACH 0