paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-09 20:26:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

# revisions: 44457,44777

Browse Source 
git-svn-id: branches/fixes_3_2@44865 -
This commit is contained in:
marco 2020-04-19 18:20:20 +00:00
parent 32b4647870
commit b087c236b5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/objpas/fgl.pp
View File

@ -1732,7 +1732,7 @@ end;
procedure TFPGMapObject.CopyData(Src, Dest: Pointer); procedure TFPGMapObject.CopyData(Src, Dest: Pointer);
begin begin
if Assigned(Pointer(Dest^)) then if Assigned(Pointer(Dest^)) And FFreeObjects then
TData(Dest^).Free; TData(Dest^).Free;
TData(Dest^) := TData(Src^); TData(Dest^) := TData(Src^);
end; end;

2
rtl/win/systhrd.inc
View File

@ -548,7 +548,7 @@ begin
{ Try to find TryEnterCriticalSection function } { Try to find TryEnterCriticalSection function }
KernelHandle:=GetModuleHandle(KernelDLL); KernelHandle:=GetModuleHandle(KernelDLL);
if KernelHandle<>0 then if KernelHandle<>0 then
WinTryEnterCriticalSection:=TTryEnterCriticalSection(GetProcAddress(KernelHandle,'TryEnterCriticalSection')); WinTryEnterCriticalSection:=TTryEnterCriticalSection(WinGetProcAddress(KernelHandle,'TryEnterCriticalSection'));
if not assigned(WinTryEnterCriticalSection) then if not assigned(WinTryEnterCriticalSection) then
WinTryEnterCriticalSection:=@Win95TryEnterCriticalSection; WinTryEnterCriticalSection:=@Win95TryEnterCriticalSection;
{$ENDIF SUPPORT_WIN95} {$ENDIF SUPPORT_WIN95}