Avoid duplicate definition of xxx_pGLOBAL_SQLPARSER at linking stage

Change-Id: I29a3a68f9ee434332cad7199a90a1b01c22fbe0e
2013-07-10 20:09:00 +03:00
parent 60a1254495
commit 986b39aa4f
2 changed files with 2 additions and 1 deletions
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -89,7 +89,7 @@ static connectivity::OSQLInternalNode* newNode(const ::rtl::OUString& _NewValue,
 #define SQL_NEW_COMMALISTRULE   newNode(aEmptyString, SQL_NODE_COMMALISTRULE, yyr1[yyn])


-connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
+extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;

 #if !(defined MACOSX && defined PPC)
 #define YYERROR_VERBOSE
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -73,6 +73,7 @@ using namespace ::osl;
 using namespace ::dbtools;
 using namespace ::comphelper;

+connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;

 namespace
 {