summaryrefslogtreecommitdiff
path: root/packages/sqlite/src
diff options
context:
space:
mode:
authormichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-10-29 09:44:16 +0000
committermichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-10-29 09:44:16 +0000
commit105d12c2fea497925f1fb95a1dd14b6c1c913ffe (patch)
tree58fb2f572935fefec77112dac076c0349efcacd7 /packages/sqlite/src
parent5728238e18d433d477991c6a1887465fdbca166c (diff)
downloadfpc-105d12c2fea497925f1fb95a1dd14b6c1c913ffe.tar.gz
* Forgot to commit
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22873 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/sqlite/src')
-rw-r--r--packages/sqlite/src/sqlite3.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/sqlite/src/sqlite3.inc b/packages/sqlite/src/sqlite3.inc
index 1a0215cfeb..16df789b0f 100644
--- a/packages/sqlite/src/sqlite3.inc
+++ b/packages/sqlite/src/sqlite3.inc
@@ -5740,6 +5740,7 @@ function InitialiseSQLite(const LibraryName: String): Integer; deprecated;
var
SQLiteLibraryHandle: TLibHandle;
SQLiteDefaultLibrary: String = Sqlite3Lib;
+ SQLiteLoadedLibrary: String;
{$ENDIF LOAD_DYNAMICALLY}
implementation
@@ -5927,7 +5928,6 @@ end;
var
RefCount: Integer;
- LoadedLibrary: String;
function TryInitializeSqlite(const LibraryName: string): Integer;
begin
@@ -5940,7 +5940,7 @@ begin
RefCount := 0;
Exit(-1);
end;
- LoadedLibrary := LibraryName;
+ SQLiteLoadedLibrary := LibraryName;
LoadAddresses(SQLiteLibraryHandle);
end;
end;
@@ -5952,8 +5952,8 @@ end;
function InitializeSQLite(const LibraryName: String) :integer;
begin
- if (LoadedLibrary <> '') and (LoadedLibrary <> LibraryName) then
- raise EInoutError.CreateFmt(SErrAlreadyLoaded,[LoadedLibrary]);
+ if (SQLiteLoadedLibrary <> '') and (SQLiteLoadedLibrary <> LibraryName) then
+ raise EInoutError.CreateFmt(SErrAlreadyLoaded,[SQLiteLoadedLibrary]);
result:= TryInitializeSQLIte(LibraryName);
if result=-1 then
@@ -5972,7 +5972,7 @@ begin
if SQLiteLibraryHandle <> NilHandle then
UnloadLibrary(SQLiteLibraryHandle);
SQLiteLibraryHandle := NilHandle;
- LoadedLibrary := '';
+ SQLiteLoadedLibrary := '';
RefCount := 0;
end;
end;