* Fix compilation after rebase

packages/fcl-db/src/sqldb/postgres/pqconnection.pp

@@ -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;
@@ -518,8 +518,6 @@ begin
     exit;
   S:='select oid,typname,typtype,typcategory from pg_type where oid in ('+S+') order by oid';
   Res:=Cursor.Handle.Exec(S,False,'Error getting typeinfo');
-  if (PQresultStatus(res)<>PGRES_TUPLES_OK) then
-    Cursor.Handle.CheckResultError(Res,[craClear],'Error getting type info');
   try
     For I:=0 to PQntuples(Res)-1 do
       begin
@@ -829,11 +827,13 @@ end;
 function TPGHandle.DescribePrepared(StmtName: String): PPGresult;
 
 Var
-  S : AnsiString;
+  S : AnsiString {$if sizeof(CHar)=1} absolute StmtName {$endif};
 
 begin
-  S:=StmtName;
-  Result:=PQdescribePrepared(FNativeConn,pchar(S));
+  {$if sizeof(CHar)=2}
+  S:=UTF8Encode(StmtName);
+  {$ENDIF}
+  Result:=PQdescribePrepared(FNativeConn,PAnsiChar(S));
 end;
 
 function TPGHandle.Exec(aSQL: String; aClearResult: Boolean; aError: String): PPGresult;
@@ -858,7 +858,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

packages/fcl-db/src/sqldb/sqldbpool.pp

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

packages/fcl-passrc/src/pscanner.pp

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