From e6c812a60a88a5ccc78177fc8edbff07e47a7b9b Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 24 Jun 2013 09:39:57 +0000 Subject: [PATCH] * assume unicode in case of FPC_OS_UNICODE instead of only for WinCE git-svn-id: branches/cpstrrtl@24959 - --- rtl/inc/exeinfo.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rtl/inc/exeinfo.pp b/rtl/inc/exeinfo.pp index 312bafb0d2..198f3265bf 100644 --- a/rtl/inc/exeinfo.pp +++ b/rtl/inc/exeinfo.pp @@ -71,11 +71,11 @@ uses var Tmm: TMemoryBasicInformation; -{$ifdef wince} +{$ifdef FPC_OS_UNICODE} TST: array[0..Max_Path] of WideChar; -{$else wince} +{$else} TST: array[0..Max_Path] of Char; -{$endif wince} +{$endif FPC_OS_UNICODE} procedure GetModuleByAddr(addr: pointer; var baseaddr: pointer; var filename: string); begin baseaddr:=nil; @@ -86,11 +86,11 @@ uses baseaddr:=Tmm.AllocationBase; TST[0]:= #0; GetModuleFileName(THandle(Tmm.AllocationBase), TST, Length(TST)); -{$ifdef wince} +{$ifdef FPC_OS_UNICODE} filename:= String(PWideChar(@TST)); -{$else wince} +{$else} filename:= String(PChar(@TST)); -{$endif wince} +{$endif FPC_OS_UNICODE} end; end;