paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 18:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r41636 into '.':

Browse Source 
U    rtl/win/sysosh.inc
--- Recording mergeinfo for merge of r41636 into '.':
 U   .
--- Merging r41795 into '.':
U    rtl/objpas/classes/classesh.inc
U    rtl/objpas/classes/collect.inc
--- Recording mergeinfo for merge of r41795 into '.':
 G   .
--- Merging r41881 into '.':
U    rtl/objpas/sysutils/syshelph.inc
--- Recording mergeinfo for merge of r41881 into '.':
 G   .
--- Merging r42149 into '.':
U    rtl/msdos/dos.pp
--- Recording mergeinfo for merge of r42149 into '.':
 G   .
--- Merging r42180 into '.':
U    rtl/freebsd/sysnr.inc
--- Recording mergeinfo for merge of r42180 into '.':
 G   .
--- Merging r42452 into '.':
U    rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r42452 into '.':
 G   .
--- Merging r42775 into '.':
U    packages/winunits-base/src/mmsystem.pp
--- Recording mergeinfo for merge of r42775 into '.':
 G   .

# revisions: 41636,41795,41881,42149,42180,42452,42775

git-svn-id: branches/fixes_3_2@42911 -
This commit is contained in:
marco 2019-09-03 13:30:49 +00:00
parent f29598384b
commit 65e16f4f98
8 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/winunits-base/src/mmsystem.pp
View File

@ -1250,7 +1250,7 @@ Type
dwUser: DWORD_PTR; dwUser: DWORD_PTR;
dwFlags: DWORD; dwFlags: DWORD;
lpNext: PMIDIHDR; lpNext: PMIDIHDR;
reserved: DWORD; reserved: DWORD_PTR;
dwOffset: DWORD; dwOffset: DWORD;
dwReserved: array [0..Pred(8)] Of DWORD_PTR; dwReserved: array [0..Pred(8)] Of DWORD_PTR;
End; End;
@ -1605,7 +1605,7 @@ _MIXERCONTROLDETAILS_BOOLEAN = packed Record
TMIXERCONTROLDETAILS_UNSIGNED = _MIXERCONTROLDETAILS_UNSIGNED; TMIXERCONTROLDETAILS_UNSIGNED = _MIXERCONTROLDETAILS_UNSIGNED;
LPTIMECALLBACK = LPTIMECALLBACK =
Procedure (uTimerID, uMsg: UINT; dwUser, dw1, dw2: DWORD);stdcall; Procedure (uTimerID, uMsg: UINT; dwUser, dw1, dw2: DWORD_PTR);stdcall;
TTIMECALLBACK=LPTIMECALLBACK; TTIMECALLBACK=LPTIMECALLBACK;
TFNTimeCallBack = TTimeCallback; // delphi compat TFNTimeCallBack = TTimeCallback; // delphi compat

1
rtl/freebsd/sysnr.inc
View File

@ -104,6 +104,7 @@ const
syscall_nr_waitpid = 7; syscall_nr_waitpid = 7;
syscall_nr_write = 4; syscall_nr_write = 4;
syscall_nr_munmap = 73; syscall_nr_munmap = 73;
syscall_nr_mprotect = 74;
syscall_nr_getsockopt = 118; syscall_nr_getsockopt = 118;
syscall_nr_rfork = 251; syscall_nr_rfork = 251;
syscall_nr_clock_gettime = 232; syscall_nr_clock_gettime = 232;

1
rtl/msdos/dos.pp
View File

@ -316,6 +316,7 @@ end;
procedure setverify(verify : boolean); procedure setverify(verify : boolean);
begin begin
dosregs.ah:=$2e; dosregs.ah:=$2e;
dosregs.dl:=0;
dosregs.al:=ord(verify); dosregs.al:=ord(verify);
msdos(dosregs); msdos(dosregs);
end; end;

1
rtl/objpas/classes/classesh.inc
View File

@ -558,6 +558,7 @@ type
function Insert(Index: Integer): TCollectionItem; function Insert(Index: Integer): TCollectionItem;
function FindItemID(ID: Integer): TCollectionItem; function FindItemID(ID: Integer): TCollectionItem;
procedure Exchange(Const Index1, index2: integer); procedure Exchange(Const Index1, index2: integer);
procedure Move(Const Index1, index2: integer);
procedure Sort(Const Compare : TCollectionSortCompare); procedure Sort(Const Compare : TCollectionSortCompare);
property Count: Integer read GetCount; property Count: Integer read GetCount;
property ItemClass: TCollectionItemClass read FItemClass; property ItemClass: TCollectionItemClass read FItemClass;

5
rtl/objpas/classes/collect.inc
View File

@ -434,6 +434,11 @@ begin
FPONotifyObservers(Self,ooChange,Nil); FPONotifyObservers(Self,ooChange,Nil);
end; end;
procedure TCollection.Move(const Index1, index2: integer);
begin
Items[Index1].Index:=Index2;
end;
{****************************************************************************} {****************************************************************************}
{* TOwnedCollection *} {* TOwnedCollection *}

2
rtl/objpas/sysutils/datih.inc
View File

@ -26,7 +26,9 @@ const
MinsPerHour = 60; MinsPerHour = 60;
SecsPerMin = 60; SecsPerMin = 60;
MSecsPerSec = 1000; MSecsPerSec = 1000;
MinsPerDay = HoursPerDay * MinsPerHour; MinsPerDay = HoursPerDay * MinsPerHour;
SecsPerHour = SecsPerMin * MinsPerHour;
SecsPerDay = MinsPerDay * SecsPerMin; SecsPerDay = MinsPerDay * SecsPerMin;
MSecsPerDay = SecsPerDay * MSecsPerSec; MSecsPerDay = SecsPerDay * MSecsPerSec;

2
rtl/objpas/sysutils/syshelph.inc
View File

@ -523,7 +523,7 @@ Type
public public
const const
MaxValue = High(NativeInt); MaxValue = High(NativeInt);
MinValue = Low(NativeUInt); MinValue = Low(NativeInt);
Public Public
Class Function Parse(const AString: string): NativeInt; inline; static; Class Function Parse(const AString: string): NativeInt; inline; static;
Class Function Size: Integer; inline; static; Class Function Size: Integer; inline; static;

2
rtl/win/sysosh.inc
View File

@ -22,7 +22,7 @@ type
THandle = DWord; THandle = DWord;
ULONG_PTR = DWord; ULONG_PTR = DWord;
{$endif CPU64} {$endif CPU64}
TThreadID = THandle; TThreadID = DWord;
SIZE_T = ULONG_PTR; SIZE_T = ULONG_PTR;
{ the fields of this record are os dependent } { the fields of this record are os dependent }