Avoid duplicate definition of xxx_pGLOBAL_SQLPARSER at linking stage

Change-Id: I29a3a68f9ee434332cad7199a90a1b01c22fbe0e

Avoid duplicate definition of xxx_pGLOBAL_SQLPARSER at linking stage
Change-Id: I29a3a68f9ee434332cad7199a90a1b01c22fbe0e
986b39aa · Tor Lillqvist · 60a12544 · 986b39aa · 986b39aa
Kaydet (Commit) 986b39aa authored Tem 10, 2013 tarafından Tor Lillqvist
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sqlbison.y connectivity/source/parse/sqlbison.y +1 -1

sqlnode.cxx connectivity/source/parse/sqlnode.cxx +1 -0

No files found.
--- 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
 {