[fpc-pascal] Re: Wince_arm: the naive approach

[Florian Klaempfl]

>>
>> What source tree do you use? Trunk? Works here
>
> Yes, trunk.

I thought you talk about fpc, anyways, the attached patch might help for 
lazarus.

>
> [1]
> Free Pascal Compiler version 2.7.1 [2013/08/04] for arm
> ..
> Target OS: WinCE for ARM
> ..
> Assembling themes
> C:\development\lazarus\lcl\include\graphic.inc(155,66) Error:
> Incompatible type for arg no. 3: Got "PChar", expected "PWideChar"
> C:\development\lazarus\lcl\include\graphic.inc(171,62) Error:
> Incompatible type for arg no. 3: Got "PChar", expected "PWideChar"
> C:\development\lazarus\lcl\include\custombitmap.inc(510,13) Error:
> Incompatible types: got "PWideChar" expected "PChar"
> ..
> C:\development\lazarus\lcl\include\icon.inc(1336,13) Error: Incompatible
> types: got "PWideChar" expected "PChar"
> C:\development\lazarus\lcl\include\cursorimage.inc(55,13) Error:
> Incompatible types: got "PWideChar" expected "PChar"
> C:\development\lazarus\lcl\graphics.pp(2812) Fatal: There were 5 errors
> compiling module, stopping

-------------- next part --------------
4b567ed86fa32bf389dcec63ffecb5009acaef4c
 lcl/controls.pp | 4 ++--
 lcl/lcltype.pp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lcl/controls.pp b/lcl/controls.pp
index 570b2e5..0de2057 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -2829,8 +2829,8 @@ begin
   Result:='';
   for cst:=low(TControlStyleType) to high(TControlStyleType) do
     if cst in cs then begin
-      if Result<>'' then Result+=',';
-      Result+=dbgs(cst);
+      if Result<>'' then Result:=Result+',';
+      Result:=Result+dbgs(cst);
     end;
   Result:='['+Result+']';
 end;
diff --git a/lcl/lcltype.pp b/lcl/lcltype.pp
index 8fcf8de..03e55c5 100644
--- a/lcl/lcltype.pp
+++ b/lcl/lcltype.pp
@@ -2166,7 +2166,7 @@ const
 // Predefined Resource Types
 //==============================================
 type
-  {$ifdef UNICODE}
+  {$if defined(FPC_OS_UNICODE) or (defined(VER2_6) and defined(UNICODE))}
   TResourceType = PWideChar;
   {$else}
   TResourceType = PChar;