diff options
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/inc/connectivity/sqlparse.hxx | 2 | ||||
| -rwxr-xr-x | connectivity/qa/makefile.mk | 8 | ||||
| -rwxr-xr-x | connectivity/source/parse/sqlbison.y | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index e7420d6c48c3..a99cd369677c 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -232,7 +232,7 @@ namespace connectivity // 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); diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index ee41cab63554..4dc2ee363389 100755 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -35,9 +35,15 @@ PACKAGE = complex/connectivity #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES := $(shell @$(FIND) complex -name "*.java") +.IF "$(SYSTEM_HSQLDB)" == "YES" +XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) +.ELSE +JARFILES+= hsqldb.jar +.ENDIF + #----- make a jar from compiled files ------------------------------ JARCLASSDIRS = $(PACKAGE) diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index dbfbd7ad1322..4fc353a51d31 100755 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -4333,7 +4333,7 @@ void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank) } // ------------------------------------------------------------------------- -void OSQLParser::error(sal_Char *fmt) +void OSQLParser::error(const sal_Char *fmt) { if(!m_sErrorMessage.getLength()) { |