[ros-diffs] [cfinck] 30165: Attempt to fix build Still not the perfect solution as it might be better to use the host/typedefs.h also for Windows hosts, but at least the code works without the obsolete typedefs64.h now.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Mon Nov  5 14:26:20 2007
New Revision: 30165

URL: http://svn.reactos.org/svn/reactos?rev=30165&view=rev
Log:
Attempt to fix build
Still not the perfect solution as it might be better to use the host/typedefs.h also for Windows hosts, but at least the code works without the obsolete typedefs64.h now.

Modified:
    trunk/reactos/tools/cabman/cabinet.h
    trunk/reactos/tools/rbuild/pch.h
    trunk/reactos/tools/rbuild/rbuild.mak

Modified: trunk/reactos/tools/cabman/cabinet.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev=30165&r1=30164&r2=30165&view=diff
==============================================================================
--- trunk/reactos/tools/cabman/cabinet.h (original)
+++ trunk/reactos/tools/cabman/cabinet.h Mon Nov  5 14:26:20 2007
@@ -14,8 +14,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <time.h>
-#include <typedefs64.h>
-typedef unsigned short USHORT, *PUSHORT;
+#include <host/typedefs.h>
 #include <unistd.h>
 #ifndef MAX_PATH
 #define MAX_PATH 260

Modified: trunk/reactos/tools/rbuild/pch.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/pch.h?rev=30165&r1=30164&r2=30165&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/pch.h (original)
+++ trunk/reactos/tools/rbuild/pch.h Mon Nov  5 14:26:20 2007
@@ -34,12 +34,7 @@
 #endif//MAX_PATH
 #else
 #include <unistd.h>
-
-typedef char CHAR, *PCHAR;
-typedef unsigned char UCHAR, *PUCHAR;
-typedef void VOID, *PVOID;
-typedef UCHAR BOOLEAN, *PBOOLEAN;
-#include <typedefs64.h>
+#include <host/typedefs.h>
 typedef LONG *PLONG;
 
 #endif//WIN32

Modified: trunk/reactos/tools/rbuild/rbuild.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?rev=30165&r1=30164&r2=30165&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.mak (original)
+++ trunk/reactos/tools/rbuild/rbuild.mak Mon Nov  5 14:26:20 2007
@@ -356,7 +356,7 @@
 	$(RBUILD_COMMON_OBJECTS) \
 	$(RBUILD_TEST_SPECIAL_OBJECTS)
 
-RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude/reactos
+RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos
 
 RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)