Skip to content
Permalink
Browse files

Fix compiler warning: "For loop control variable must be simple local…

… variable"
  • Loading branch information...
ansgarbecker committed Jun 3, 2019
1 parent 0500f12 commit 6e2bca2ffad9f7f5f62dea80c04a8402a838251d
Showing with 7 additions and 5 deletions.
  1. +7 −5 source/dbconnection.pas
@@ -2255,7 +2255,8 @@ procedure TDBConnection.DoBeforeConnect;

procedure TMySQLConnection.DoBeforeConnect;
var
msg: String;
msg,
TryLibraryPath: String;
OldErrorMode: Cardinal;
TryLibraryPaths: TStringList;
begin
@@ -2270,17 +2271,18 @@ procedure TMySQLConnection.DoBeforeConnect;
TryLibraryPaths.Add('libmariadb.dll');
TryLibraryPaths.Add('libmysql.dll');

for LibMysqlPath in TryLibraryPaths do begin
Log(lcDebug, f_('Loading library file %s ...', [LibMysqlPath]));
for TryLibraryPath in TryLibraryPaths do begin
Log(lcDebug, f_('Loading library file %s ...', [TryLibraryPath]));
// Temporarily suppress error popups while loading new library on Windows XP, see #79
OldErrorMode := SetErrorMode(SEM_FAILCRITICALERRORS);
SetErrorMode(OldErrorMode or SEM_FAILCRITICALERRORS);
LibMysqlHandle := LoadLibrary(PWideChar(LibMysqlPath));
LibMysqlHandle := LoadLibrary(PWideChar(TryLibraryPath));
SetErrorMode(OldErrorMode);
if LibMysqlHandle = 0 then begin
// Win XP needs libmysql.dll
Log(lcDebug, f_('Could not load %s', [LibMysqlPath]));
Log(lcDebug, f_('Could not load %s', [TryLibraryPath]));
end else begin
LibMysqlPath := TryLibraryPath;
Break;
end;
end;

0 comments on commit 6e2bca2

Please sign in to comment.
You can’t perform that action at this time.