mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: FPC 3.0.4 compatibility (fixes #385)

Browse source
This commit is contained in:
Alexander Koblov 2022-05-24 19:49:29 +03:00
commit 2c28d3debe
5 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/wcx/unrar/src/unrarfunc.pas
View file

@ -25,7 +25,7 @@
unit UnRARFunc;
{$mode objfpc}{$H+}
{$ifndef VER3_2}
{$if FPC_FULLVERSION >= 30300}
{$modeswitch arraytodynarray}
{$endif}
{$include calling.inc}

9
src/filesources/filesystem/ufilesystemutil.pas
View file

@ -1,6 +1,9 @@
unit uFileSystemUtil;
{$mode objfpc}{$H+}
{$if FPC_FULLVERSION >= 30300}
{$modeswitch arraytodynarray}
{$endif}
interface
@ -1615,15 +1618,13 @@ end;
function TFileSystemOperationHelper.FileExists(aFile: TFile;
var AbsoluteTargetFileName: String; AllowAppend: Boolean
): TFileSourceOperationOptionFileExists;
type
TFileSourceOperationUIResponses = array of TFileSourceOperationUIResponse;
const
Responses: TFileSourceOperationUIResponses
Responses: array[0..13] of TFileSourceOperationUIResponse
= (fsourOverwrite, fsourSkip, fsourRenameSource, fsourOverwriteAll,
fsourSkipAll, fsourResume, fsourOverwriteOlder, fsourCancel,
fsouaCompare, fsourAppend, fsourOverwriteSmaller, fsourOverwriteLarger,
fsourAutoRenameSource, fsourAutoRenameTarget);
ResponsesNoAppend: TFileSourceOperationUIResponses
ResponsesNoAppend: array[0..11] of TFileSourceOperationUIResponse
= (fsourOverwrite, fsourSkip, fsourRenameSource, fsourOverwriteAll,
fsourSkipAll, fsourOverwriteSmaller, fsourOverwriteOlder, fsourCancel,
fsouaCompare, fsourOverwriteLarger, fsourAutoRenameSource, fsourAutoRenameTarget);

2
src/filesources/ufilesourceoperationui.pas
View file

@ -40,6 +40,8 @@ type
// Actions will never be returned since they do not close the window, handle them in ActionHandler.
fsouaCompare); // The first action, hardcoded. Add new actions after this and new answers before this line.
TFileSourceOperationUIResponses = array of TFileSourceOperationUIResponse;
TFileSourceOperationUIAnswer = Low(TFileSourceOperationUIResponse)..Pred(fsouaCompare);
TFileSourceOperationUIAction = fsouaCompare..High(TFileSourceOperationUIResponse);

9
src/filesources/wcxarchive/uwcxarchivecopyoutoperation.pas
View file

@ -1,6 +1,9 @@
unit uWcxArchiveCopyOutOperation;
{$mode objfpc}{$H+}
{$if FPC_FULLVERSION >= 30300}
{$modeswitch arraytodynarray}
{$endif}
{$include calling.inc}
interface
@ -569,14 +572,12 @@ end;
function TWcxArchiveCopyOutOperation.DoFileExists(Header: TWcxHeader;
var AbsoluteTargetFileName: String): TFileSourceOperationOptionFileExists;
type
TFileSourceOperationUIResponses = array of TFileSourceOperationUIResponse;
const
Responses: TFileSourceOperationUIResponses
Responses: array[0..10] of TFileSourceOperationUIResponse
= (fsourOverwrite, fsourSkip, fsourOverwriteLarger, fsourOverwriteAll,
fsourSkipAll, fsourOverwriteSmaller, fsourOverwriteOlder, fsourCancel,
fsouaCompare, fsourRenameSource, fsourAutoRenameSource);
ResponsesNoCompare: TFileSourceOperationUIResponses
ResponsesNoCompare: array[0..9] of TFileSourceOperationUIResponse
= (fsourOverwrite, fsourSkip, fsourOverwriteLarger, fsourOverwriteAll,
fsourSkipAll, fsourOverwriteSmaller, fsourOverwriteOlder, fsourCancel,
fsourRenameSource, fsourAutoRenameSource);

9
src/filesources/wfxplugin/uwfxpluginutil.pas
View file

@ -1,6 +1,9 @@
unit uWfxPluginUtil;
{$mode objfpc}{$H+}
{$if FPC_FULLVERSION >= 30300}
{$modeswitch arraytodynarray}
{$endif}
interface
@ -438,13 +441,11 @@ end;
function TWfxPluginOperationHelper.FileExists(aFile: TFile;
AbsoluteTargetFileName: String; AllowResume: Boolean
): TFileSourceOperationOptionFileExists;
type
TFileSourceOperationUIResponses = array of TFileSourceOperationUIResponse;
const
Responses: TFileSourceOperationUIResponses
Responses: array[0..6] of TFileSourceOperationUIResponse
= (fsourOverwrite, fsourSkip, fsourResume, fsourOverwriteAll, fsourSkipAll,
fsouaCompare, fsourCancel);
ResponsesNoResume: TFileSourceOperationUIResponses
ResponsesNoResume: array[0..5] of TFileSourceOperationUIResponse
= (fsourOverwrite, fsourSkip, fsourOverwriteAll, fsourSkipAll, fsouaCompare,
fsourCancel);
var