From 56e83ce5dd84ee4811edc68954eb23bf33d42193 Mon Sep 17 00:00:00 2001
From: lacak <lacak@idefix.freepascal.org>
Date: Tue, 12 Aug 2014 05:13:14 +0000
Subject: [PATCH] fcl-db: interbase: fix cases when client library is not
loaded dynamically but link statically
git-svn-id: trunk@28383 -
---
.../src/sqldb/interbase/ibconnection.pp | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/packages/fcl-db/src/sqldb/interbase/ibconnection.pp b/packages/fcl-db/src/sqldb/interbase/ibconnection.pp
index 60cfbc8d41..d49789760e 100644
--- a/packages/fcl-db/src/sqldb/interbase/ibconnection.pp
+++ b/packages/fcl-db/src/sqldb/interbase/ibconnection.pp
@@ -1614,29 +1614,41 @@ end;
class function TIBConnectionDef.DefaultLibraryName: String;
begin
+{$IFDEF LinkDynamically}
If UseEmbeddedFirebird then
Result:=fbembedlib
else
- Result:=fbclib
+ Result:=fbclib;
+{$ELSE}
+ Result:='';
+{$ENDIF}
end;
class function TIBConnectionDef.LoadFunction: TLibraryLoadFunction;
begin
+{$IFDEF LinkDynamically}
Result:=@InitialiseIBase60;
+{$ELSE}
+ Result:=nil;
+{$ENDIF}
end;
class function TIBConnectionDef.UnLoadFunction: TLibraryUnLoadFunction;
begin
+{$IFDEF LinkDynamically}
Result:=@ReleaseIBase60
+{$ELSE}
+ Result:=nil;
+{$ENDIF}
end;
class function TIBConnectionDef.LoadedLibraryName: string;
begin
- {$IfDef LinkDynamically}
+{$IFDEF LinkDynamically}
Result:=IBaseLoadedLibrary;
- {$else}
+{$ELSE}
Result:='';
- {$endif}
+{$ENDIF}
end;
initialization