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

+ Patch from peter to fix make cycle

Browse Source
This commit is contained in:
michael 2003-11-27 10:28:41 +00:00
parent 28ed277547
commit 5d024d4cc3
5 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/inc/runerrors.pp
View File

@ -318,7 +318,14 @@ Function GetRunError(Errno : Byte) : String;
begin begin
Result:=RunErrorArray[Errno]; Result:=RunErrorArray[Errno];
If length(Result)=0 then If length(Result)=0 then
{$ifdef VER1_0}
begin
Str(Errno,Result);
Result:=RunUnknown+Result;
end;
{$else}
Result:=RunUnknown+Str(Errno); Result:=RunUnknown+Str(Errno);
{$endif}
end; end;
end. end.

7
rtl/inc/threadh.inc
View File

@ -71,7 +71,9 @@ Function GetThreadManager(Var TM : TThreadManager) : Boolean;
Function SetThreadManager(Const NewTM : TThreadManager; Var OldTM : TThreadManager) : Boolean; Function SetThreadManager(Const NewTM : TThreadManager; Var OldTM : TThreadManager) : Boolean;
Procedure SetNoThreadManager; Procedure SetNoThreadManager;
// Needs to be exported, so the manager can call it. // Needs to be exported, so the manager can call it.
{$ifdef HASTHREADVAR}
procedure InitThreadVars(RelocProc : Pointer); procedure InitThreadVars(RelocProc : Pointer);
{$endif HASTHREADVAR}
procedure InitThread(stklen:cardinal); procedure InitThread(stklen:cardinal);
{***************************************************************************** {*****************************************************************************
@ -117,7 +119,10 @@ procedure LeaveCriticalsection(var cs : TRTLCriticalSection);
{ {
$Log$ $Log$
Revision 1.12 2003-11-26 20:10:59 michael Revision 1.13 2003-11-27 10:28:41 michael
+ Patch from peter to fix make cycle
Revision 1.12 2003/11/26 20:10:59 michael
+ New threadmanager implementation + New threadmanager implementation
Revision 1.11 2003/10/01 21:00:09 peter Revision 1.11 2003/10/01 21:00:09 peter

2
rtl/win32/Makefile
View File

@ -225,7 +225,7 @@ OBJPASDIR=$(RTL)/objpas
GRAPHDIR=$(INC)/graph GRAPHDIR=$(INC)/graph
include $(WININC)/makefile.inc include $(WININC)/makefile.inc
WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
override TARGET_UNITS+=$(SYSTEMUNIT) systhrds objpas strings lineinfo heaptrc windows ole2 activex winsock initc dos crt objects graph messages sysutils classes typinfo math varutils variants cpu mmx charset ucomplex getopts wincrt winmouse winevent sockets printer dynlibs video mouse keyboard types comobj dateutils rtlconst sysconstrunerrors override TARGET_UNITS+=$(SYSTEMUNIT) systhrds objpas strings lineinfo heaptrc windows ole2 activex winsock initc dos crt objects graph messages sysutils classes typinfo math varutils variants cpu mmx charset ucomplex getopts wincrt winmouse winevent sockets printer dynlibs video mouse keyboard types comobj dateutils rtlconst sysconst runerrors
override TARGET_LOADERS+=wprt0 wdllprt0 gprt0 override TARGET_LOADERS+=wprt0 wdllprt0 gprt0
override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst runerrors override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst runerrors
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y

2
rtl/win32/Makefile.fpc
View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) systhrds objpas strings \
sysutils classes typinfo math varutils variants \ sysutils classes typinfo math varutils variants \
cpu mmx charset ucomplex getopts \ cpu mmx charset ucomplex getopts \
wincrt winmouse winevent sockets printer dynlibs \ wincrt winmouse winevent sockets printer dynlibs \
video mouse keyboard types comobj dateutils rtlconst sysconst\ video mouse keyboard types comobj dateutils rtlconst sysconst \
runerrors runerrors
rsts=math varutils typinfo variants classes dateutils sysconst runerrors rsts=math varutils typinfo variants classes dateutils sysconst runerrors

7
rtl/win32/systhrds.pp
View File

@ -376,10 +376,12 @@ begin
DoneCriticalSection :=@SysDoneCriticalSection; DoneCriticalSection :=@SysDoneCriticalSection;
EnterCriticalSection :=@SysEnterCriticalSection; EnterCriticalSection :=@SysEnterCriticalSection;
LeaveCriticalSection :=@SysLeaveCriticalSection; LeaveCriticalSection :=@SysLeaveCriticalSection;
{$ifdef HASTHREADVAR}
InitThreadVar :=@SysInitThreadVar; InitThreadVar :=@SysInitThreadVar;
RelocateThreadVar :=@SysRelocateThreadVar; RelocateThreadVar :=@SysRelocateThreadVar;
AllocateThreadVars :=@SysAllocateThreadVars; AllocateThreadVars :=@SysAllocateThreadVars;
ReleaseThreadVars :=@SysReleaseThreadVars; ReleaseThreadVars :=@SysReleaseThreadVars;
{$endif HASTHREADVAR}
end; end;
SetThreadManager(WinThreadManager,Dummy); SetThreadManager(WinThreadManager,Dummy);
InitHeapMutexes; InitHeapMutexes;
@ -391,7 +393,10 @@ end.
{ {
$Log$ $Log$
Revision 1.7 2003-11-26 20:10:59 michael Revision 1.8 2003-11-27 10:28:41 michael
+ Patch from peter to fix make cycle
Revision 1.7 2003/11/26 20:10:59 michael
+ New threadmanager implementation + New threadmanager implementation
Revision 1.6 2003/10/01 21:00:09 peter Revision 1.6 2003/10/01 21:00:09 peter