From 0021d0f27b8148a986afd5e3d1e314800357cc00 Mon Sep 17 00:00:00 2001 From: joost Date: Wed, 10 Oct 2007 15:50:03 +0000 Subject: [PATCH] Patch from Zaher Dirkey (modified) * Set Sqlite3Lib on WinCE * In dynamic lib, sqlite3_version must be aliased as like in static lib to sqlite3_libversion * sqlite3_version function must called with the () at last, because sqlite3_version pointer to function git-svn-id: trunk@8759 - --- packages/base/sqlite/sqlite3.inc | 4 ++-- packages/fcl-db/src/sqlite/sqlite3ds.pas | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/base/sqlite/sqlite3.inc b/packages/base/sqlite/sqlite3.inc index 8142fc39fa..830f321a88 100644 --- a/packages/base/sqlite/sqlite3.inc +++ b/packages/base/sqlite/sqlite3.inc @@ -25,7 +25,7 @@ uses {$PACKRECORDS C} const -{$IFDEF MSWINDOWS} +{$IFDEF WINDOWS} Sqlite3Lib = 'sqlite3.dll'; {$else} Sqlite3Lib = 'libsqlite3.so'; @@ -505,7 +505,7 @@ begin pointer(sqlite3_collation_needed16) := GetProcedureAddress(LibHandle,'sqlite3_collation_needed16'); pointer(sqlite3_libversion):=GetProcedureAddress(LibHandle,'sqlite3_libversion'); //Alias for allowing better code portability (win32 is not working with external variables) - pointer(sqlite3_version):=GetProcedureAddress(LibHandle,'sqlite3_version'); + pointer(sqlite3_version):=GetProcedureAddress(LibHandle,'sqlite3_libversion'); // Not published functions pointer(sqlite3_libversion_number):=GetProcedureAddress(LibHandle,'sqlite3_libversion_number'); diff --git a/packages/fcl-db/src/sqlite/sqlite3ds.pas b/packages/fcl-db/src/sqlite/sqlite3ds.pas index ef3bece3bd..e41c7f9a3b 100644 --- a/packages/fcl-db/src/sqlite/sqlite3ds.pas +++ b/packages/fcl-db/src/sqlite/sqlite3ds.pas @@ -304,7 +304,7 @@ end; function TSqlite3Dataset.GetSqliteVersion: String; begin - Result:=StrPas(sqlite3_version); + Result:=StrPas(sqlite3_version()); end; function TSqlite3Dataset.QuickQuery(const ASql:String;const AStrList: TStrings;FillObjects:Boolean):String;