diff options
| author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-06-01 10:22:42 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-06-01 10:22:42 -0500 |
| commit | d0ff33b1fe48e45ca08f7ca62dc36486250ecb77 (patch) | |
| tree | 4cf47d0b1ab194cbdbf2b9088bd6b4e74514895a /testing/libreoffice/buildfix_bison25.diff | |
| parent | a132c57ad9882be1abe3785f1f103d6e5011866f (diff) | |
| parent | c40a217db5f63be3aa88a32ad77ec93efb40d95c (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
kde-unstable/calligra/PKGBUILD
Diffstat (limited to 'testing/libreoffice/buildfix_bison25.diff')
| -rw-r--r-- | testing/libreoffice/buildfix_bison25.diff | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/testing/libreoffice/buildfix_bison25.diff b/testing/libreoffice/buildfix_bison25.diff new file mode 100644 index 000000000..869b6c81e --- /dev/null +++ b/testing/libreoffice/buildfix_bison25.diff @@ -0,0 +1,23 @@ +--- connectivity/source/parse/sqlbison.y 2011-05-20 13:21:02.000000000 -0600 ++++ connectivity/source/parse/sqlbison.y 2011-05-20 13:22:11.000000000 -0600 +@@ -4338,7 +4338,7 @@ + } + + // ------------------------------------------------------------------------- +-void OSQLParser::error(sal_Char *fmt) ++void OSQLParser::error(const sal_Char *fmt) + { + if(!m_sErrorMessage.getLength()) + { +--- connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:58.000000000 -0600 ++++ connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:46.000000000 -0600 +@@ -233,7 +233,7 @@ + // returns the type for a parameter in a given function name + static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); + +- void error(sal_Char *fmt); ++ void error(const sal_Char *fmt); + int SQLlex(); + #ifdef YYBISON + void setParseTree(OSQLParseNode * pNewParseTree); + |