From 5f1565e7fd1f342845c72ea18d54abfa790765f6 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 20 Jul 2002 19:00:52 +0000
Subject: [PATCH] Explicitly specify the path to wpp.h so we don't need to
 change the include path, to avoid conflicts with multiple y.tab.h files.

---
 tools/widl/Makefile.in | 1 -
 tools/widl/parser.l    | 2 +-
 tools/widl/widl.c      | 2 +-
 tools/wrc/Makefile.in  | 1 -
 tools/wrc/parser.y     | 2 +-
 tools/wrc/wrc.c        | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index 98b2c083693..677648517c7 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 LEXOPT    = -Cf #-w -b
 YACCOPT   = #-v
 EXEEXT    = @EXEEXT@
-EXTRAINCL = -I$(TOPSRCDIR)/tools/wpp
 EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
 
 PROGRAMS = widl$(EXEEXT)
diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index 47a4748678f..0ff67cfb04b 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -42,7 +42,7 @@ uuid	{hexd}{8}-{hexd}{4}-{hexd}{4}-{hexd}{4}-{hexd}{12}
 #include "widl.h"
 #include "utils.h"
 #include "parser.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 
 #include "y.tab.h"
 
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index f726d2b35c3..8dfbcd513c2 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -35,7 +35,7 @@
 #include "utils.h"
 #include "parser.h"
 #include "proxy.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 
 static char usage[] =
 "Usage: widl [options...] infile.idl\n"
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 8cbd6f6c06b..7d2d1659e7a 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 LEXOPT    = -Cf #-w -b
 YACCOPT   = #-v
 EXEEXT    = @EXEEXT@
-EXTRAINCL = -I$(TOPSRCDIR)/tools/wpp
 EXTRALIBS = -L$(TOPOBJDIR)/tools/wpp -lwpp
 
 PROGRAMS = wrc$(EXEEXT)
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 7cdcb827bb0..942725dbbac 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -136,7 +136,7 @@
 #include "utils.h"
 #include "newstruc.h"
 #include "dumpres.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 #include "parser.h"
 #include "windef.h"
 #include "winbase.h"
diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c
index 9041c13a39c..9b9330c2bec 100644
--- a/tools/wrc/wrc.c
+++ b/tools/wrc/wrc.c
@@ -65,7 +65,7 @@
 #include "genres.h"
 #include "newstruc.h"
 #include "parser.h"
-#include "wpp.h"
+#include "../wpp/wpp.h"
 
 static char usage[] =
 	"Usage: wrc [options...] [infile[.rc|.res]]\n"