+ Patch from peter to fix make cycle

rtl/inc/runerrors.pp

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

rtl/inc/threadh.inc

@@ -71,7 +71,9 @@ Function GetThreadManager(Var TM : TThreadManager) : Boolean;
 Function SetThreadManager(Const NewTM : TThreadManager; Var OldTM : TThreadManager) : Boolean;
 Procedure SetNoThreadManager;
 // Needs to be exported, so the manager can call it.
+{$ifdef HASTHREADVAR}
 procedure InitThreadVars(RelocProc : Pointer);
+{$endif HASTHREADVAR}
 procedure InitThread(stklen:cardinal);
 
 {*****************************************************************************
@@ -117,7 +119,10 @@ procedure LeaveCriticalsection(var cs : TRTLCriticalSection);
 
 {
   $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
 
   Revision 1.11  2003/10/01 21:00:09  peter

rtl/win32/Makefile

@@ -225,7 +225,7 @@ OBJPASDIR=$(RTL)/objpas
 GRAPHDIR=$(INC)/graph
 include $(WININC)/makefile.inc
 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_RSTS+=math varutils typinfo variants classes dateutils sysconst runerrors
 override INSTALL_FPCPACKAGE=y
@@ -1359,11 +1359,11 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 comobj$(PPUEXT) : comobj.pp activex$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(OBJPASDIR)/comobjh.inc $(OBJPASDIR)/comobj.inc
 	$(COMPILER) -I$(OBJPASDIR) comobj.pp
 rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp
-  $(COMPILER) $(OBJPASDIR)/rtlconst.pp
+	$(COMPILER) $(OBJPASDIR)/rtlconst.pp
 sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp
-  $(COMPILER) $(OBJPASDIR)/sysconst.pp
+	$(COMPILER) $(OBJPASDIR)/sysconst.pp
 dateutils$(PPUEXT) : $(OBJPASDIR)/dateutils.pp
-  $(COMPILER) $(OBJPASDIR)/dateutils.pp
+	$(COMPILER) $(OBJPASDIR)/dateutils.pp
 cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)

rtl/win32/Makefile.fpc

@@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) systhrds objpas strings \
       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\
+      video mouse keyboard types comobj dateutils rtlconst sysconst \
       runerrors
 
 rsts=math varutils typinfo variants classes dateutils sysconst runerrors
@@ -199,13 +199,13 @@ comobj$(PPUEXT) : comobj.pp activex$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PP
         $(COMPILER) -I$(OBJPASDIR) comobj.pp
 
 rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp
-  $(COMPILER) $(OBJPASDIR)/rtlconst.pp
+        $(COMPILER) $(OBJPASDIR)/rtlconst.pp
 
 sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp
-  $(COMPILER) $(OBJPASDIR)/sysconst.pp
+        $(COMPILER) $(OBJPASDIR)/sysconst.pp
 
 dateutils$(PPUEXT) : $(OBJPASDIR)/dateutils.pp
-  $(COMPILER) $(OBJPASDIR)/dateutils.pp
+        $(COMPILER) $(OBJPASDIR)/dateutils.pp
 
 #
 # Other system-independent RTL Units

rtl/win32/systhrds.pp

@@ -376,10 +376,12 @@ begin
     DoneCriticalSection    :=@SysDoneCriticalSection;
     EnterCriticalSection   :=@SysEnterCriticalSection;
     LeaveCriticalSection   :=@SysLeaveCriticalSection;
+{$ifdef HASTHREADVAR}
     InitThreadVar          :=@SysInitThreadVar;
     RelocateThreadVar      :=@SysRelocateThreadVar;
     AllocateThreadVars     :=@SysAllocateThreadVars;
     ReleaseThreadVars      :=@SysReleaseThreadVars;
+{$endif HASTHREADVAR}
     end;
   SetThreadManager(WinThreadManager,Dummy);
   InitHeapMutexes;
@@ -391,7 +393,10 @@ end.
 
 {
   $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
 
   Revision 1.6  2003/10/01 21:00:09  peter