diff --git a/lcl/lresources.pp b/lcl/lresources.pp index 9a43a1a587..556db618b2 100644 --- a/lcl/lresources.pp +++ b/lcl/lresources.pp @@ -267,6 +267,9 @@ procedure WriteLRSReversedWords(s: TStream; p: Pointer; Count: integer); implementation +{$IFDEF HASWIDESTRING}{$IFNDEF VER1_9_8} +{$DEFINE HASTOKENWIDESTRING} +{$ENDIF}{$ENDIF} const LineEnd: ShortString = LineEnding; @@ -1679,7 +1682,7 @@ var end; toString: begin - {$IFDEF HASWIDESTRING} + {$IFDEF HASTOKENWIDESTRING} toStringBuf := parser.TokenWideString; {$ELSE} toStringBuf := parser.TokenString; @@ -1688,10 +1691,10 @@ var begin parser.NextToken; // Get next string fragment parser.CheckToken(toString); - {$IFDEF HASWIDESTRING} - toStringBuf := toStringBuf + parser.TokenString; - {$ELSE} + {$IFDEF HASTOKENWIDESTRING} toStringBuf := toStringBuf + parser.TokenWideString; + {$ELSE} + toStringBuf := toStringBuf + parser.TokenString; {$ENDIF} end; {$IFDEF HASWIDESTRING}