diff options
| -rw-r--r-- | packages/fcl-db/src/base/dataset.inc | 21 | ||||
| -rw-r--r-- | utils/fpcm/revision.inc | 2 |
2 files changed, 3 insertions, 20 deletions
diff --git a/packages/fcl-db/src/base/dataset.inc b/packages/fcl-db/src/base/dataset.inc index 5c66828ed3..30a6b3d28b 100644 --- a/packages/fcl-db/src/base/dataset.inc +++ b/packages/fcl-db/src/base/dataset.inc @@ -534,23 +534,6 @@ end; procedure TDataSet.DataConvert(aField: TField; aSource, aDest: Pointer; aToNative: Boolean); - // There seems to be no WStrCopy defined, this is a copy of - // the generic StrCopy function, adapted for WideChar. - Function WStrCopy(Dest, Source:PWideChar): PWideChar; - var - counter : SizeInt; - Begin - counter := 0; - while Source[counter] <> #0 do - begin - Dest[counter] := char(Source[counter]); - Inc(counter); - end; - { terminate the string } - Dest[counter] := #0; - WStrCopy := Dest; - end; - var DT : TFieldType; @@ -566,7 +549,7 @@ begin // See notes from mantis bug-report 8204 for more information // ftBytes : ; // ftVarBytes : ; - ftWideString : WStrCopy(PWideChar(aDest), PWideChar(aSource)); + ftWideString : StrCopy(PWideChar(aDest), PWideChar(aSource)); end end else @@ -578,7 +561,7 @@ begin ftFMTBCD : TBcd(aDest^) := TBcd(aSource^); // ftBytes : ; // ftVarBytes : ; - ftWideString : WStrCopy(PWideChar(aDest), PWideChar(aSource)); + ftWideString : StrCopy(PWideChar(aDest), PWideChar(aSource)); end end end; diff --git a/utils/fpcm/revision.inc b/utils/fpcm/revision.inc index aac1a25180..5fb0a8d73c 100644 --- a/utils/fpcm/revision.inc +++ b/utils/fpcm/revision.inc @@ -1 +1 @@ -'2017-02-13 rev 35434' +'2017-12-01 rev 37640' |