mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid duplicate definition of xxx_pGLOBAL_SQLPARSER at linking stage

Browse Source 
Change-Id: I29a3a68f9ee434332cad7199a90a1b01c22fbe0e
This commit is contained in:
Tor Lillqvist
2013-07-10 20:09:00 +03:00
parent 60a1254495
commit 986b39aa4f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/source/parse/sqlbison.y
View File

@@ -89,7 +89,7 @@ static connectivity::OSQLInternalNode* newNode(const ::rtl::OUString& _NewValue,
#define SQL_NEW_COMMALISTRULE newNode(aEmptyString, SQL_NODE_COMMALISTRULE, yyr1[yyn]) #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) #if !(defined MACOSX && defined PPC)
#define YYERROR_VERBOSE #define YYERROR_VERBOSE

1
connectivity/source/parse/sqlnode.cxx
View File

@@ -73,6 +73,7 @@ using namespace ::osl;
using namespace ::dbtools; using namespace ::dbtools;
using namespace ::comphelper; using namespace ::comphelper;
connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
namespace namespace
{ {