[ros-diffs] [cfinck] 29964: Revert hpoussin's commit in r29960 to unbreak build. Most of *our* stuff has separated host/target headers now, but the Wine-shared components still include headers from include/reactos/wine. And these headers (like "winnt.h" in that directory) include our headers from include/psdk themselves, which are meant to be used for target components, but not for host tools. This needs to be fixed first, before we can remove this hack.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Tue Oct 30 00:42:29 2007
New Revision: 29964

URL: http://svn.reactos.org/svn/reactos?rev=29964&view=rev
Log:
Revert hpoussin's commit in r29960 to unbreak build.

Most of *our* stuff has separated host/target headers now, but the Wine-shared components still include headers from include/reactos/wine.
And these headers (like "winnt.h" in that directory) include our headers from include/psdk themselves, which are meant to be used for target components, but not for host tools.

This needs to be fixed first, before we can remove this hack.

Modified:
    trunk/reactos/tools/tools.mak

Modified: trunk/reactos/tools/tools.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29964&r1=29963&r2=29964&view=diff
==============================================================================
--- trunk/reactos/tools/tools.mak (original)
+++ trunk/reactos/tools/tools.mak Tue Oct 30 00:42:29 2007
@@ -8,6 +8,10 @@
 TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS)
 TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS)
 TOOLS_LFLAGS = $(HOST_LFLAGS)
+
+# HACK: Remove those lines once host tools don't use target headers anymore
+TOOLS_CFLAGS += -D__i386__
+TOOLS_CPPFLAGS += -D__i386__
 
 $(TOOLS_INT): | $(INTERMEDIATE)
 	$(ECHO_MKDIR)