paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-07 12:50:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Some fixes for compilation with unicodertl (new methods after merge)

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-07-24 16:30:18 +02:00
parent f0ef6b08ed
commit 65f9c53759
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-db/src/sqldb/postgres/pqconnection.pp
View File

@ -68,7 +68,7 @@ type
Function CheckConnectionStatus(doRaise : Boolean = True) : Boolean;
Function DescribePrepared(StmtName : String): PPGresult;
Function Exec(aSQL : String; aClearResult : Boolean; aError : String = '') : PPGresult;
function ExecPrepared(stmtName: AnsiString; nParams:longint; paramValues:PPchar; paramLengths:Plongint;paramFormats:Plongint; aClearResult : Boolean) : PPGresult;
function ExecPrepared(stmtName: AnsiString; nParams:longint; paramValues:PPAnsichar; paramLengths:Plongint;paramFormats:Plongint; aClearResult : Boolean) : PPGresult;
procedure CheckResultError(var res: PPGresult; Actions : TCheckResultActions; const ErrMsg: string);
Property Connection : TPQConnection Read FCOnnection;
Property NativeConn : PPGConn Read FNativeConn;
@ -831,7 +831,7 @@ Var
begin
S:=StmtName;
Result:=PQdescribePrepared(FNativeConn,pchar(S));
Result:=PQdescribePrepared(FNativeConn,pansichar(S));
end;
function TPGHandle.Exec(aSQL: String; aClearResult: Boolean; aError: String): PPGresult;
@ -856,7 +856,7 @@ begin
end;
function TPGHandle.ExecPrepared(stmtName: AnsiString; nParams: longint;
paramValues: PPchar; paramLengths: Plongint; paramFormats: Plongint;
paramValues: PPAnsichar; paramLengths: Plongint; paramFormats: Plongint;
aClearResult: Boolean): PPGresult;
var

8
packages/fcl-db/src/sqldb/sqldbpool.pp
View File

@ -150,7 +150,7 @@ type
function CreateKey(aDef : TSQLDBConnectionDef) : String; virtual;
function CreateDef: TSQLDBConnectionDef;
function DoFindConnection(const aConnectionDef: TSQLDBConnectionDef): TSQLConnection; virtual;
procedure DoDisconnect(Item: TObject; const Key: string; var Continue: Boolean);
procedure DoDisconnect(Item: TObject; const Key: ansistring; var Continue: Boolean);
public
Constructor Create(aOwner : TComponent); override;
Destructor Destroy; override;
@ -1113,7 +1113,7 @@ result:=TSQLConnection(FPool[key]);
end;
*)
procedure TSQLDBConnectionPool.DoDisconnect(Item: TObject; const Key: string;
procedure TSQLDBConnectionPool.DoDisconnect(Item: TObject; const Key: ansistring;
var Continue: Boolean);
Var
@ -1199,13 +1199,13 @@ Type
private
FCount : Integer;
Public
Procedure DoCount(Item: TObject; const Key: string; var Continue: Boolean);
Procedure DoCount(Item: TObject; const Key: ansistring; var Continue: Boolean);
Property Count : Integer Read FCount;
end;
{ TConnectionCounter }
procedure TConnectionCounter.DoCount(Item: TObject; const Key: string; var Continue: Boolean);
procedure TConnectionCounter.DoCount(Item: TObject; const Key: Ansistring; var Continue: Boolean);
begin
FCount:=FCount+(Item as TConnectionList).Count;
Continue:=True;

4
packages/fcl-passrc/src/pscanner.pp
View File

@ -5146,7 +5146,7 @@ function TPascalScanner.HandleMultilineCommentOldStyle: TToken;
var
{$ifdef UsePChar}
TokenStart: PChar;
TokenStart: PAnsiChar;
OldLength: integer;
Ch: AnsiChar;
LE: String[2];
@ -5243,7 +5243,7 @@ function TPascalScanner.HandleMultilineComment: TToken;
var
{$ifdef UsePChar}
TokenStart: PChar;
TokenStart: PAnsiChar;
OldLength: integer;
Ch: AnsiChar;
LE: String[2];

8
packages/fcl-web/src/base/httpdefs.pp
View File

@ -520,7 +520,7 @@ type
constructor Create; override;
destructor destroy; override;
Function GetNextPathInfo : String;
Function ToString: ansistring; override;
Function ToString: RTLString; override;
Property RequestID : String Read FRequestID;
Property RouteParams[AParam : String] : String Read GetRP Write SetRP;
Property ReturnedPathInfo : String Read FReturnedPathInfo Write FReturnedPathInfo;
@ -576,7 +576,7 @@ type
Procedure SendHeaders;
Procedure SendResponse; // Delphi compatibility
Procedure SendRedirect(const TargetURL:String);
Function ToString: ansistring; override;
Function ToString: RTLstring; override;
// Set Code and CodeText. Send content if aSend=True
Procedure SetStatus(aStatus : Cardinal; aSend : Boolean = False);
Property Request : TRequest Read FRequest;
@ -2253,7 +2253,7 @@ begin
{$ifdef CGIDEBUG}SendDebug(Format('Pathinfo: "%s" "%s" : %s',[P,FReturnedPathInfo,Result]));{$ENDIF}
end;
function TRequest.ToString: ansistring;
function TRequest.ToString: rtlstring;
begin
Result:='['+RequestID+'] : '+URL;
end;
@ -2964,7 +2964,7 @@ begin
end;
end;
function TResponse.ToString: ansistring;
function TResponse.ToString: rtlstring;
begin
if assigned(Request) then
Result:=Request.ToString