[ros-diffs] [reactos] 345/360: [WINESYNC] makefiles: Specify the bison prefix directly in the source files.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb75eae9837b947766daf…

commit eb75eae9837b947766daf2381ffc694373479e95
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Mar 14 00:16:50 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:42 2022 +0100

    [WINESYNC] makefiles: Specify the bison prefix directly in the source files.
    
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id f4af3134dec425706b74428317e9ab327b6061cc by Alexandre Julliard
<julliard(a)winehq.org>
---
 dll/win32/msi/CMakeLists.txt | 4 ++--
 dll/win32/msi/cond.y         | 5 +++--
 dll/win32/msi/sql.y          | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt
index 6f335cd269c..56fcc80cb25 100644
--- a/dll/win32/msi/CMakeLists.txt
+++ b/dll/win32/msi/CMakeLists.txt
@@ -47,8 +47,8 @@ list(APPEND SOURCE
     upgrade.c
     where.c)
 
-BISON_TARGET(cond cond.y ${CMAKE_CURRENT_BINARY_DIR}/cond.tab.c COMPILE_FLAGS "-p
cond_")
-BISON_TARGET(sql sql.y ${CMAKE_CURRENT_BINARY_DIR}/sql.tab.c COMPILE_FLAGS "-p
sql_")
+BISON_TARGET(cond cond.y ${CMAKE_CURRENT_BINARY_DIR}/cond.tab.c)
+BISON_TARGET(sql sql.y ${CMAKE_CURRENT_BINARY_DIR}/sql.tab.c)
 
 set(OLD_IDL_FLAGS ${IDL_FLAGS})
 set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_)
diff --git a/dll/win32/msi/cond.y b/dll/win32/msi/cond.y
index 7bf3e3f831a..17df0a4248c 100644
--- a/dll/win32/msi/cond.y
+++ b/dll/win32/msi/cond.y
@@ -115,6 +115,7 @@ static void value_free( struct value val )
 
 %lex-param { COND_input *info }
 %parse-param { COND_input *info }
+%define api.prefix {cond_}
 %define api.pure
 
 %union
@@ -126,7 +127,7 @@ static void value_free( struct value val )
     BOOL bool;
 }
 
-%token COND_SPACE COND_EOF
+%token COND_SPACE
 %token COND_OR COND_AND COND_NOT COND_XOR COND_IMP COND_EQV
 %token COND_LT COND_GT COND_EQ COND_NE COND_GE COND_LE
 %token COND_ILT COND_IGT COND_IEQ COND_INE COND_IGE COND_ILE
@@ -135,7 +136,7 @@ static void value_free( struct value val )
 %token COND_PERCENT COND_DOLLARS COND_QUESTION COND_AMPER COND_EXCLAM
 %token <str> COND_IDENT <str> COND_NUMBER <str> COND_LITER
 
-%nonassoc COND_ERROR COND_EOF
+%nonassoc COND_ERROR
 
 %type <bool> expression boolean_term boolean_factor
 %type <value> value
diff --git a/dll/win32/msi/sql.y b/dll/win32/msi/sql.y
index 5b5c8bd7f8e..885593a9d18 100644
--- a/dll/win32/msi/sql.y
+++ b/dll/win32/msi/sql.y
@@ -58,6 +58,7 @@ static struct expr * EXPR_wildcard( void *info );
 
 %lex-param { SQL_input *info }
 %parse-param { SQL_input *info }
+%define api.prefix {sql_}
 %define api.pure
 
 %union