paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 13:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: interbase: fix cases when client library is not loaded dynamically but link statically

Browse Source 
git-svn-id: trunk@28383 -
This commit is contained in:
lacak 2014-08-12 05:13:14 +00:00
parent 499dd078e3
commit 56e83ce5dd
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/fcl-db/src/sqldb/interbase/ibconnection.pp
View File

@ -1614,29 +1614,41 @@ end;
class function TIBConnectionDef.DefaultLibraryName: String; class function TIBConnectionDef.DefaultLibraryName: String;
begin begin
{$IFDEF LinkDynamically}
If UseEmbeddedFirebird then If UseEmbeddedFirebird then
Result:=fbembedlib Result:=fbembedlib
else else
Result:=fbclib Result:=fbclib;
{$ELSE}
Result:='';
{$ENDIF}
end; end;
class function TIBConnectionDef.LoadFunction: TLibraryLoadFunction; class function TIBConnectionDef.LoadFunction: TLibraryLoadFunction;
begin begin
{$IFDEF LinkDynamically}
Result:=@InitialiseIBase60; Result:=@InitialiseIBase60;
{$ELSE}
Result:=nil;
{$ENDIF}
end; end;
class function TIBConnectionDef.UnLoadFunction: TLibraryUnLoadFunction; class function TIBConnectionDef.UnLoadFunction: TLibraryUnLoadFunction;
begin begin
{$IFDEF LinkDynamically}
Result:=@ReleaseIBase60 Result:=@ReleaseIBase60
{$ELSE}
Result:=nil;
{$ENDIF}
end; end;
class function TIBConnectionDef.LoadedLibraryName: string; class function TIBConnectionDef.LoadedLibraryName: string;
begin begin
{$IfDef LinkDynamically} {$IFDEF LinkDynamically}
Result:=IBaseLoadedLibrary; Result:=IBaseLoadedLibrary;
{$else} {$ELSE}
Result:=''; Result:='';
{$endif} {$ENDIF}
end; end;
initialization initialization