--- Merging r13586 into '.':

U    packages/fcl-base/src/custapp.pp
--- Merging r13590 into '.':
U    packages/postgres/src/postgres3dyn.pp

git-svn-id: branches/fixes_2_4@13777 -

packages/fcl-base/src/custapp.pp

@@ -466,7 +466,7 @@ begin
           end
         else // Short Option.
           begin
-          HaveArg:=(I<ParamCount) and (Length(ParamStr(I+1))>0) and (ParamStr(I+1)[i]<>FOptionChar);
+          HaveArg:=(I<ParamCount) and (Length(ParamStr(I+1))>0) and (ParamStr(I+1)[1]<>FOptionChar);
           If HaveArg then
             OV:=Paramstr(I+1);
           If Not CaseSensitiveOptions then

packages/postgres/src/postgres3dyn.pp

@@ -269,7 +269,7 @@ begin
     pointer(PQexec) := GetProcedureAddress(Postgres3LibraryHandle,'PQexec');
     pointer(PQexecParams) := GetProcedureAddress(Postgres3LibraryHandle,'PQexecParams');
     pointer(PQexecPrepared) := GetProcedureAddress(Postgres3LibraryHandle,'PQexecPrepared');
-    pointer(PQPrepare) := GetProcedureAddress(Postgres3LibraryHandle,'PQPrepare');
+    pointer(PQPrepare) := GetProcedureAddress(Postgres3LibraryHandle,'PQprepare');
     pointer(PQsendQuery) := GetProcedureAddress(Postgres3LibraryHandle,'PQsendQuery');
     pointer(PQsendQueryParams) := GetProcedureAddress(Postgres3LibraryHandle,'PQsendQueryParams');
     pointer(PQsendQueryPrepared) := GetProcedureAddress(Postgres3LibraryHandle,'PQsendQueryPrepared');