From f7c69baac6b2c088660674d178d682af744f1d0c Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 15 Oct 2020 11:18:56 +0000 Subject: [PATCH] LazUtils: Dont override TProcess.Execute for TProcessUTF8 starting from FPC 3.2. Issue #35991 git-svn-id: branches/fixes_2_0@64009 - --- components/lazutils/utf8process.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/lazutils/utf8process.pp b/components/lazutils/utf8process.pp index 83390f944a..2d7c44dcde 100644 --- a/components/lazutils/utf8process.pp +++ b/components/lazutils/utf8process.pp @@ -14,14 +14,16 @@ unit UTF8Process; {$mode objfpc}{$H+} {$IFDEF MSWINDOWS} +{$IF FPC_FULLVERSION < 30200} {$DEFINE UseTProcessW} {$ENDIF} +{$ENDIF} interface uses Classes, SysUtils, Process, - {$IF defined(UseSeparateTProcessW) or defined(UseTProcessW)} + {$IFDEF UseTProcessW} pipes, {$ENDIF} FileUtil, LazFileUtils, LazUTF8, LazUtilsStrConsts; @@ -199,9 +201,6 @@ Const PriorityConstants : Array [TProcessPriority] of Cardinal = (HIGH_PRIORITY_CLASS,IDLE_PRIORITY_CLASS, NORMAL_PRIORITY_CLASS,REALTIME_PRIORITY_CLASS - {$if (FPC_FULLVERSION >= 30200) and not defined(WinCE)} - ,BELOW_NORMAL_PRIORITY_CLASS,ABOVE_NORMAL_PRIORITY_CLASS - {$endif} ); function WStrAsUniquePWideChar(var s: UnicodeString): PWideChar; inline;