diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-07-10 20:09:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-07-10 20:48:49 +0300 |
| commit | 986b39aa4f9ccafc4aafb0c4959832ad47aa83c9 (patch) | |
| tree | 15b89e40faaca6aff01316e4798a79caa5a574b5 /connectivity | |
| parent | 60a1254495bfd4895fb46b671e562262fb7358ee (diff) | |
Avoid duplicate definition of xxx_pGLOBAL_SQLPARSER at linking stage
Change-Id: I29a3a68f9ee434332cad7199a90a1b01c22fbe0e
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 2 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index a3703b77ec41..d5bc6fb5ff3c 100644 --- 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 diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 07143e82bc00..787b1fa08c21 100644 --- 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 { |