From 689d943dabd0d6e3a08e433f6964b26c5f7223c3 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 9 Sep 2006 11:25:19 +0200
Subject: [PATCH] msi: Specify the bison name prefix directly in the source
 file.

---
 dlls/msi/Makefile.in | 4 ++--
 dlls/msi/cond.y      | 1 +
 dlls/msi/sql.y       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index b122de416da..47728e0768a 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -58,10 +58,10 @@ EXTRA_OBJS = sql.tab.o cond.tab.o
 @MAKE_DLL_RULES@
 
 sql.tab.c sql.tab.h: sql.y
-	$(BISON) -p SQL_ -d $(SRCDIR)/sql.y -o sql.tab.c
+	$(BISON) -d $(SRCDIR)/sql.y -o sql.tab.c
 
 cond.tab.c cond.tab.h: cond.y
-	$(BISON) -p COND_ -d $(SRCDIR)/cond.y -o cond.tab.c
+	$(BISON) -d $(SRCDIR)/cond.y -o cond.tab.c
 
 # hack to allow parallel make
 sql.tab.h: sql.tab.c
diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
index fda2c69f1dc..26d0ecb99fc 100644
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -102,6 +102,7 @@ static BOOL num_from_prop( LPCWSTR p, INT *val )
 %}
 
 %pure-parser
+%name-prefix="COND_"
 
 %union
 {
diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index 8fa0fb340c3..5d5a904eea1 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -67,6 +67,7 @@ static struct expr * EXPR_wildcard( void *info );
 %}
 
 %pure-parser
+%name-prefix="SQL_"
 
 %union
 {