Răsfoiți Sursa

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

git-svn-id: trunk@28383 -
lacak 11 ani în urmă
părinte
comite
56e83ce5dd
1 a modificat fișierele cu 16 adăugiri și 4 ștergeri
  1. 16 4
      packages/fcl-db/src/sqldb/interbase/ibconnection.pp

+ 16 - 4
packages/fcl-db/src/sqldb/interbase/ibconnection.pp

@@ -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