[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_driver.hxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 756cf8411b6ca233cfed708024be05c8f800a986
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 27 16:59:04 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Aug 28 20:30:16 2018 +0200

    SYSTEM_MYSQL_CPPCONN is never defined
    
    ...since 5061663ce052087c6d5d0910d6f99358e26dbbd1 "drop unnecessary
    SYSTEM_MYSQL_CONNECTOR_CPP"
    
    Change-Id: I2023baf04dfb050833a0032367fc2dc2cfdb9d92
    Reviewed-on: https://gerrit.libreoffice.org/59670
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/59717
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
index 89c57630823e..d0f7febf8d13 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
@@ -54,12 +54,10 @@ protected:
     OWeakRefArray m_xConnections; // vector containing a list
         // of all the Connection objects
         // for this Driver
-#ifndef SYSTEM_MYSQL_CPPCONN
 #ifdef BUNDLE_MARIADB
     oslModule m_hCConnModule;
     bool m_bAttemptedLoadCConn;
 #endif
-#endif
 public:
     explicit MysqlCDriver(const Reference<css::lang::XMultiServiceFactory>& _rxFactory);