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

* updated testpackages to use newest version of libhandler

Browse Source 
git-svn-id: trunk@13996 -
This commit is contained in:
ivost 2009-11-01 11:31:37 +00:00
parent a9150ebb8a
commit e5ef111466
6 changed files with 521 additions and 671 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1003
packages/ibase/src/ibase60.inc
View File

File diff suppressed because it is too large Load Diff

2
packages/ibase/src/ibase60.pp
View File

@ -2,7 +2,7 @@
} }
unit ibase60; unit ibase60;
{$UNDEF LinkDynamically} {$UNDEF LOAD_DYNAMICALLY}
{$i ibase60.inc} {$i ibase60.inc}

2
packages/ibase/src/ibase60dyn.pp
View File

@ -11,7 +11,7 @@
unit ibase60dyn; unit ibase60dyn;
{$DEFINE LinkDynamically} {$DEFINE LOAD_DYNAMICALLY}
{$i ibase60.inc} {$i ibase60.inc}

31
packages/mysql/src/mysql.inc
View File

@ -1506,9 +1506,8 @@ uses
{$endif} {$endif}
{$IFDEF LOAD_DYNAMICALLY} {$IFDEF LOAD_DYNAMICALLY}
function InitializeMysql(argc: cint = -1; argv: PPchar = nil; groups: PPchar = nil): Integer; function InitializeMysql(const LibraryName: String = ''; argc: cint = -1; argv: PPchar = nil; groups: PPchar = nil): Integer;
function InitializeMysql(const LibraryName: String; argc: cint = -1; argv: PPchar = nil; groups: PPchar = nil): Integer; function TryInitializeMysql(const LibraryName: string = ''; argc: cint = -1; argv: PPchar = nil; groups: PPchar = nil): Integer;
function TryInitializeMysql(const LibraryName: string; argc: cint = -1; argv: PPchar = nil; groups: PPchar = nil): Integer;
function ReleaseMysql: Integer; function ReleaseMysql: Integer;
var var
@ -1689,16 +1688,20 @@ type
groups: PPchar; groups: PPchar;
end; end;
function mysql_initialize(User: Pointer; Handler: PLibHandler; out ErrorMsg: String): Boolean; function mysql_initialize(User: Pointer; Handler: PLibHandler): Boolean;
var var
args: PMysqlArgs absolute User; args: PMysqlArgs absolute User;
begin begin
Result := mysql_library_init(args^.argc, args^.argv, args^.groups) = 0; if Assigned(args) then
Result := mysql_library_init(args^.argc, args^.argv, args^.groups) = 0
else
Result := mysql_library_init(0, nil, nil) = 0;
if not Result then if not Result then
ErrorMsg := 'mysql_library_init failed'; AppendLibraryError(Handler^, 'mysql_library_init failed');
end; end;
procedure mysql_finalize(User: Pointer; Handler: PLibHandler); procedure mysql_finalize(Handler: PLibHandler);
begin begin
mysql_library_end(); mysql_library_end();
end; end;
@ -1713,16 +1716,6 @@ begin
Result := TryInitializeLibrary(MysqlLibrary, LibraryName, @args); Result := TryInitializeLibrary(MysqlLibrary, LibraryName, @args);
end; end;
function InitializeMysql(argc: cint; argv: PPchar; groups: PPchar): Integer;
var
args: TMysqlArgs;
begin
args.argc := argc;
args.argv := argv;
args.groups := groups;
Result := InitializeLibrary(MysqlLibrary, [mysqllib,mysqlvlib], @args);
end;
function InitializeMysql(const LibraryName: String; argc: cint; argv: PPchar; groups: PPchar): Integer; function InitializeMysql(const LibraryName: String; argc: cint; argv: PPchar; groups: PPchar): Integer;
var var
args: TMysqlArgs; args: TMysqlArgs;
@ -1740,7 +1733,7 @@ end;
function InitialiseMysql(argc: cint; argv: PPchar; groups: PPchar): Integer; function InitialiseMysql(argc: cint; argv: PPchar; groups: PPchar): Integer;
begin begin
Result := InitializeMysql(argc, argv, groups); Result := InitializeMysql('', argc, argv, groups);
end; end;
function InitialiseMysql(const LibraryName: String; argc: cint; argv: PPchar; groups: PPchar): Integer; function InitialiseMysql(const LibraryName: String; argc: cint; argv: PPchar; groups: PPchar): Integer;
@ -1754,7 +1747,7 @@ begin
end; end;
initialization initialization
MysqlLibrary := LibraryHandler('mysql', @mysql_symbols, Length(mysql_symbols), @mysql_initialize, @mysql_finalize); MysqlLibrary := LibraryHandler('mysql', [mysqllib,mysqlvlib], @mysql_symbols, Length(mysql_symbols), @mysql_initialize, @mysql_finalize);
{$ENDIF} {$ENDIF}
end. end.

14
packages/sqlite/src/sqlite3.inc
View File

@ -5716,9 +5716,8 @@ const
SQLITE_TESTCTRL_BITVEC_TEST = 8; SQLITE_TESTCTRL_BITVEC_TEST = 8;
{$IFDEF LOAD_DYNAMICALLY} {$IFDEF LOAD_DYNAMICALLY}
function InitializeSqlite: Integer; function InitializeSqlite(const LibraryName: String = ''): Integer;
function InitializeSqlite(const LibraryName: String): Integer; function TryInitializeSqlite(const LibraryName: string = ''): Integer;
function TryInitializeSqlite(const LibraryName: string): Integer;
function ReleaseSqlite: Integer; function ReleaseSqlite: Integer;
var var
@ -5910,11 +5909,6 @@ begin
Result := TryInitializeLibrary(SqliteLibrary, LibraryName); Result := TryInitializeLibrary(SqliteLibrary, LibraryName);
end; end;
function InitializeSqlite: Integer;
begin
Result := InitializeLibrary(SqliteLibrary, sqlite3lib);
end;
function InitializeSqlite(const LibraryName: String): Integer; function InitializeSqlite(const LibraryName: String): Integer;
begin begin
Result := InitializeLibrary(SqliteLibrary, LibraryName); Result := InitializeLibrary(SqliteLibrary, LibraryName);
@ -5927,7 +5921,7 @@ end;
function InitialiseSqlite: Integer; function InitialiseSqlite: Integer;
begin begin
Result := InitializeSqlite; Result := InitializeSqlite('');
end; end;
function InitialiseSqlite(const LibraryName: String): Integer; function InitialiseSqlite(const LibraryName: String): Integer;
@ -5941,7 +5935,7 @@ begin
end; end;
initialization initialization
SqliteLibrary := LibraryHandler('sqlite', @sqlite3_symbols, Length(sqlite3_symbols)); SqliteLibrary := LibraryHandler('sqlite', [sqlite3lib], @sqlite3_symbols, Length(sqlite3_symbols));
{$ENDIF} {$ENDIF}
end. end.

140
packages/zorba/examples/simple/simple.lpi
View File

@ -35,8 +35,8 @@
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="simple"/> <UnitName Value="simple"/>
<CursorPos X="4" Y="69"/> <CursorPos X="1" Y="12"/>
<TopLine Value="60"/> <TopLine Value="1"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<UsageCount Value="20"/> <UsageCount Value="20"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -46,17 +46,13 @@
<UnitName Value="zorba"/> <UnitName Value="zorba"/>
<CursorPos X="7" Y="3"/> <CursorPos X="7" Y="3"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="4"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="../../src/zorba.inc"/> <Filename Value="../../src/zorba.inc"/>
<CursorPos X="5" Y="937"/> <CursorPos X="5" Y="937"/>
<TopLine Value="915"/> <TopLine Value="915"/>
<EditorIndex Value="5"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="../../../../../zorba/zorba/include/simplestore/simplestorec.h"/> <Filename Value="../../../../../zorba/zorba/include/simplestore/simplestorec.h"/>
@ -68,16 +64,14 @@
<Unit4> <Unit4>
<Filename Value="../../src/zorba_error.inc"/> <Filename Value="../../src/zorba_error.inc"/>
<CursorPos X="5" Y="28"/> <CursorPos X="5" Y="28"/>
<TopLine Value="6"/> <TopLine Value="1"/>
<EditorIndex Value="3"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="../../../../../zorba/zorba/include/zorba/zorbac.h"/> <Filename Value="../../../../../zorba/zorba/include/zorba/zorbac.h"/>
<CursorPos X="17" Y="262"/> <CursorPos X="17" Y="262"/>
<TopLine Value="312"/> <TopLine Value="312"/>
<EditorIndex Value="7"/> <EditorIndex Value="4"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<SyntaxHighlighter Value="C++"/> <SyntaxHighlighter Value="C++"/>
@ -86,7 +80,7 @@
<Filename Value="../../src/zorba_options.inc"/> <Filename Value="../../src/zorba_options.inc"/>
<CursorPos X="3" Y="104"/> <CursorPos X="3" Y="104"/>
<TopLine Value="82"/> <TopLine Value="82"/>
<EditorIndex Value="6"/> <EditorIndex Value="3"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit6> </Unit6>
@ -108,127 +102,43 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit8> </Unit8>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="9" HistoryIndex="8">
<Position1> <Position1>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="13" Column="53" TopLine="1"/>
</Position1>
<Position2>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="81" Column="39" TopLine="59"/>
</Position2>
<Position3>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="322" Column="45" TopLine="300"/>
</Position3>
<Position4>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="327" Column="39" TopLine="300"/>
</Position4>
<Position5>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="333" Column="111" TopLine="300"/>
</Position5>
<Position6>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1953" Column="26" TopLine="1931"/>
</Position6>
<Position7>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1956" Column="19" TopLine="1931"/>
</Position7>
<Position8>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1961" Column="42" TopLine="1931"/>
</Position8>
<Position9>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1965" Column="46" TopLine="1931"/>
</Position9>
<Position10>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1969" Column="73" TopLine="1931"/>
</Position10>
<Position11>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1972" Column="42" TopLine="1943"/>
</Position11>
<Position12>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="6" Column="1" TopLine="1"/>
</Position12>
<Position13>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="81" Column="39" TopLine="59"/>
</Position13>
<Position14>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="322" Column="45" TopLine="300"/>
</Position14>
<Position15>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="327" Column="39" TopLine="300"/>
</Position15>
<Position16>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="333" Column="111" TopLine="300"/>
</Position16>
<Position17>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1953" Column="26" TopLine="1931"/>
</Position17>
<Position18>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1956" Column="19" TopLine="1931"/>
</Position18>
<Position19>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1961" Column="42" TopLine="1931"/>
</Position19>
<Position20>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1965" Column="46" TopLine="1931"/>
</Position20>
<Position21>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1969" Column="73" TopLine="1931"/>
</Position21>
<Position22>
<Filename Value="../../src/zorba.inc"/>
<Caret Line="1972" Column="42" TopLine="1931"/>
</Position22>
<Position23>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="16" Column="23" TopLine="2"/> <Caret Line="16" Column="23" TopLine="2"/>
</Position23> </Position1>
<Position24> <Position2>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="22" Column="11" TopLine="1"/> <Caret Line="22" Column="11" TopLine="1"/>
</Position24> </Position2>
<Position25> <Position3>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="21" Column="20" TopLine="1"/> <Caret Line="21" Column="20" TopLine="1"/>
</Position25> </Position3>
<Position26> <Position4>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="20" Column="4" TopLine="1"/> <Caret Line="20" Column="4" TopLine="1"/>
</Position26> </Position4>
<Position27> <Position5>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="79" Column="30" TopLine="52"/> <Caret Line="79" Column="30" TopLine="52"/>
</Position27> </Position5>
<Position28> <Position6>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="92" Column="5" TopLine="59"/> <Caret Line="92" Column="5" TopLine="59"/>
</Position28> </Position6>
<Position29> <Position7>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="83" Column="18" TopLine="59"/> <Caret Line="83" Column="18" TopLine="59"/>
</Position29> </Position7>
<Position30> <Position8>
<Filename Value="simple.lpr"/> <Filename Value="simple.lpr"/>
<Caret Line="62" Column="1" TopLine="25"/> <Caret Line="62" Column="1" TopLine="25"/>
</Position30> </Position8>
<Position9>
<Filename Value="simple.lpr"/>
<Caret Line="84" Column="18" TopLine="60"/>
</Position9>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>