[Libreoffice-commits] core.git: connectivity/source

[Jan-Marek Glogowski (via logerrit)]

 connectivity/source/drivers/odbc/OFunctions.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 39276660f862b8d534db971d53490450f8ec5d9e
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat May 22 21:54:18 2021 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Wed May 26 09:55:43 2021 +0200

    Fix DISABLE_DYNLOADING unused variable
    
    Change-Id: Ie8305364971f324bd834ae6bec851637ca60b9e9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116118
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index ae89531763a1..951eb8b36bff 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -89,7 +89,9 @@ bool LoadLibrary_ODBC3(OUString &_rPath)
 
     if (bLoaded)
         return true;
-#ifndef DISABLE_DYNLOADING
+#ifdef DISABLE_DYNLOADING
+    (void)_rPath;
+#else
 #ifdef _WIN32
     _rPath = "ODBC32.DLL";
 #endif
@@ -112,7 +114,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath)
 
     if ( !pODBCso )
         pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
-#endif
+#endif // DISABLE_DYNLOADING
     if( !pODBCso)
         return false;