diff --git a/rtl/amiga/dos.pp b/rtl/amiga/dos.pp
index 0cd1b62418..d782c5a954 100644
--- a/rtl/amiga/dos.pp
+++ b/rtl/amiga/dos.pp
@@ -857,7 +857,7 @@ end;
 
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -1612,7 +1612,10 @@ End.
 
 {
   $Log$
-  Revision 1.6  2004-02-15 21:26:37  hajny
+  Revision 1.7  2004-02-16 22:16:55  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.6  2004/02/15 21:26:37  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.5  2004/02/09 12:03:16  michael
diff --git a/rtl/beos/dos.pp b/rtl/beos/dos.pp
index 2d88ea48cb..3fc895489e 100644
--- a/rtl/beos/dos.pp
+++ b/rtl/beos/dos.pp
@@ -282,7 +282,7 @@ End;
 ******************************************************************************}
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -969,7 +969,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.7  2004-02-15 21:26:37  hajny
+  Revision 1.8  2004-02-16 22:16:57  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.7  2004/02/15 21:26:37  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.6  2004/02/09 12:03:16  michael
diff --git a/rtl/emx/dos.pas b/rtl/emx/dos.pas
index 184fa24ca0..87d83f6046 100644
--- a/rtl/emx/dos.pas
+++ b/rtl/emx/dos.pas
@@ -329,7 +329,7 @@ begin
 end;
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -1211,7 +1211,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.10  2004-02-15 21:26:37  hajny
+  Revision 1.11  2004-02-16 22:16:58  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.10  2004/02/15 21:26:37  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.9  2004/02/09 12:03:16  michael
diff --git a/rtl/go32v2/dos.pp b/rtl/go32v2/dos.pp
index 553829bd74..ccace70b6c 100644
--- a/rtl/go32v2/dos.pp
+++ b/rtl/go32v2/dos.pp
@@ -168,7 +168,7 @@ End;
 ******************************************************************************}
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -950,7 +950,10 @@ End;
 end.
 {
   $Log$
-  Revision 1.19  2004-02-15 21:34:06  hajny
+  Revision 1.20  2004-02-16 22:16:59  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.19  2004/02/15 21:34:06  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.18  2004/02/09 12:03:16  michael
diff --git a/rtl/netware/dos.pp b/rtl/netware/dos.pp
index 7aad7d1dc0..111f447098 100644
--- a/rtl/netware/dos.pp
+++ b/rtl/netware/dos.pp
@@ -135,7 +135,7 @@ End;
 ******************************************************************************}
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -750,7 +750,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.8  2004-02-15 21:34:06  hajny
+  Revision 1.9  2004-02-16 22:16:59  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.8  2004/02/15 21:34:06  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.7  2004/02/09 12:03:16  michael
diff --git a/rtl/os2/dos.pas b/rtl/os2/dos.pas
index 3d85207719..f73565044d 100644
--- a/rtl/os2/dos.pas
+++ b/rtl/os2/dos.pas
@@ -158,7 +158,7 @@ begin
 end;
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -684,7 +684,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.36  2004-02-15 21:34:06  hajny
+  Revision 1.37  2004-02-16 22:16:59  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.36  2004/02/15 21:34:06  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.35  2004/02/15 08:02:44  yuri
diff --git a/rtl/os2/system.pas b/rtl/os2/system.pas
index 7a17ff5bf1..96b953aa28 100644
--- a/rtl/os2/system.pas
+++ b/rtl/os2/system.pas
@@ -500,7 +500,29 @@ begin
 {$ENDIF}
   p:=int_heap_end;
   // commit memory
-  rc:=DosSetMem(p, size, $10+3);
+  rc:=DosSetMem(p, size, $13);
+
+{
+  Not yet working
+  if RC = 8 then
+
+( * Not enough memory was allocated - let's try to allocate more
+   (4 MB steps or as much as requested if more than 4 MB needed). * )
+
+   begin
+    if Size > 4 * 1024 * 1024 then
+     RC := DosAllocMem (P, Size, 3)
+    else
+     RC := DosAllocMem (P, 4 * 1024 * 1024, 3);
+    if RC = 0 then
+     begin
+      Int_Heap := P;
+      Int_Heap_End := Int_Heap;
+      RC := DosSetMem (P, Size, $13);
+     end;
+   end;
+}
+
   if rc<>0 then p:=nil;
 {$IFDEF DUMPGROW}
   WriteLn ('New heap at ', Cardinal(p));
@@ -1405,7 +1427,18 @@ begin
     //   Note: Check for higher limit of heap not implemented yet.
     //   Note: Check for amount of memory for process not implemented yet.
     //         While used hard-coded value of max heapsize (256Mb)
+
+{}
     DosAllocMem(Int_Heap, 256*1024*1024, 3);
+{
+This should be changed as soon as dynamic allocation within sbrk works.
+
+256 MB RAM is way too much - there might not be so much physical RAM and swap
+space on some systems. Let's start on 16 MB - that isn't enough for cycling
+the compiler, of course, but more should get allocated dynamically on demand.
+
+    DosAllocMem(Int_Heap, 16 * 1024 * 1024, 3);
+}
     Int_Heap_End:=Int_Heap;
     InitHeap;
 
@@ -1438,7 +1471,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.65  2004-02-02 03:24:09  yuri
+  Revision 1.66  2004-02-16 22:18:44  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.65  2004/02/02 03:24:09  yuri
   - prt1.as removed
   - removed tmporary code/comments
   - prt1 compilation error workaround removed
diff --git a/rtl/unix/dos.pp b/rtl/unix/dos.pp
index fce2d9e761..f2bbd9b37d 100644
--- a/rtl/unix/dos.pp
+++ b/rtl/unix/dos.pp
@@ -224,7 +224,7 @@ End;
 ******************************************************************************}
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -828,7 +828,10 @@ End.
 
 {
   $Log$
-  Revision 1.26  2004-02-15 21:36:10  hajny
+  Revision 1.27  2004-02-16 22:18:44  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.26  2004/02/15 21:36:10  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.25  2004/02/09 17:01:28  marco
diff --git a/rtl/watcom/dos.pp b/rtl/watcom/dos.pp
index dab2cd4288..51c4e799ed 100644
--- a/rtl/watcom/dos.pp
+++ b/rtl/watcom/dos.pp
@@ -168,7 +168,7 @@ End;
 ******************************************************************************}
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -951,7 +951,10 @@ end.
 
 {
   $Log$
-  Revision 1.6  2004-02-15 21:36:10  hajny
+  Revision 1.7  2004-02-16 22:18:44  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.6  2004/02/15 21:36:10  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.5  2004/02/09 12:03:16  michael
diff --git a/rtl/win32/dos.pp b/rtl/win32/dos.pp
index e9bb7eb273..d59205c015 100644
--- a/rtl/win32/dos.pp
+++ b/rtl/win32/dos.pp
@@ -310,7 +310,7 @@ type
      stdcall; external 'kernel32' name 'CloseHandle';
 
 {$ifdef HASTHREADVAR}
-threadvar
+{thread}var
 {$else HASTHREADVAR}
 var
 {$endif HASTHREADVAR}
@@ -960,7 +960,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.24  2004-02-15 21:36:10  hajny
+  Revision 1.25  2004-02-16 22:18:44  hajny
+    * LastDosExitCode changed back from threadvar temporarily
+
+  Revision 1.24  2004/02/15 21:36:10  hajny
     * overloaded ExecuteProcess added, EnvStr param changed to longint
 
   Revision 1.23  2004/02/09 12:03:16  michael