[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - connectivity/Library_dbtools.mk connectivity/source

[Christian Lohmaier]

 connectivity/Library_dbtools.mk      |    2 ++
 connectivity/source/parse/sqlbison.y |    8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7986c0368cdbb642d91c0293647d16a7c218c867
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Jun 15 01:31:46 2012 +0200

    ancient bison nees %token-table for yytname to be usable
    
    fixes build with XCode 2.5 (Mac/PPC)
    (cherry picked from commit f14bd201ad7c391b078be1d8e7fb2d072015be70)

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 25d4009..54cc68e 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1,3 +1,4 @@
+%token-table
 %{
 //--------------------------------------------------------------------------
 //
commit 3b1a5f26ed62d064f6a3a4f9a7b68292fa587a5c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Jun 13 23:07:37 2012 +0200

    WaE: avoid build break on Mac PPC/XCode 2.5
    
    otherwise breaks with comparison beetween signed and unsigned integer
    expressions
    (cherry picked from commit f5e1c75333594ea00d8ccdb1c69a7446c06f4ce9)

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 2c144e0..25d4009 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -129,7 +129,9 @@ static connectivity::OSQLInternalNode* newNode(const ::rtl::OUString& _NewValue,
 
 connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
 
+#if !(defined MACOSX && defined PPC)
 #define YYERROR_VERBOSE
+#endif
 
 #define SQLyyerror(s)						\
 {											\
commit 0892a1aefa66f7e5c20a7707f565614b31fc416c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Jun 13 16:09:25 2012 +0200

    use commandline parameters instead of bison directives (XCode 2.5)
    
    XCode 2.5 only has ancient bison that doesn't support the %file-prefix,
    %name-prefix,... directives. So use the more compatible commandline
    arguments (just like before gbuildification of the module)
    (cherry picked from commit 874926b2e2b92e5b46e1ece110cac9e40c131baa)

diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 55d74c0..93539de 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -82,6 +82,8 @@ $(eval $(call gb_Library_add_grammars,dbtools,\
 	connectivity/source/parse/sqlbison \
 ))
 
+$(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison) : T_YACCFLAGS := -d -l -pSQLyy -bsql
+
 $(eval $(call gb_Library_add_scanners,dbtools,\
 connectivity/source/parse/sqlflex \
 ))
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 87b3f89..2c144e0 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1,8 +1,3 @@
-%file-prefix="sql"
-%name-prefix="SQLyy"
-%no-lines
-%defines
-
 %{
 //--------------------------------------------------------------------------
 //