+ FCL made compilable under OS/2

fcl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/15]
 #
 
 defaultrule: all
@@ -24,6 +24,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@@ -194,6 +195,7 @@ endif
 
 override DIROBJECTS+=$(wildcard ../xml ../shedit)
 override UNITOBJECTS+=classes $(INCUNITS)
+override RSTOBJECTS+=classes cachecls
 
 # Clean
 
@@ -921,6 +923,16 @@ override CLEANPPUFILES+=$(UNITPPUFILES)
 
 fpc_units: $(UNITPPUFILES)
 
+#####################################################################
+# Resource strings
+#####################################################################
+
+ifdef RSTOBJECTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))
+
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+
 #####################################################################
 # General compile rules
 #####################################################################

fcl/os2/Makefile.fpc

@@ -5,6 +5,7 @@
 [targets]
 dirs=../xml ../shedit
 units=classes $(INCUNITS)
+rst=classes cachecls
 
 [defaults]
 defaulttarget=os2

fcl/os2/classes.pp

@@ -24,6 +24,7 @@ unit Classes;
 interface
 
 uses
+  DosCalls, (* Needed here (i.e. before SysUtils) to avoid type clashes. *)
   strings,
   sysutils;
 
@@ -32,7 +33,6 @@ uses
 implementation
 
 uses
-  doscalls,
   typinfo;
 
 { OS - independent class implementations are in /inc directory. }
@@ -47,7 +47,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.3  2000-08-25 17:32:16  hajny
+  Revision 1.4  2000-12-19 00:43:07  hajny
+    + FCL made compilable under OS/2
+
+  Revision 1.3  2000/08/25 17:32:16  hajny
     * Cosmetic change (OS/2 instead of win32 in header)
 
   Revision 1.2  2000/07/13 11:33:01  michael

fcl/os2/pipes.inc

@@ -1,4 +1,5 @@
 {
+    $Id$
     $Id$
     This file is part of the Free Pascal run time library.
     Copyright (c) 1999-2000 by Michael Van Canneyt
@@ -14,6 +15,12 @@
 
  **********************************************************************}
 
+uses
+ DosCalls;
+
+const
+ PipeBufSize = 1024;
+
 Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean;
 
 begin
@@ -21,7 +28,10 @@ begin
 end;
 {
   $Log$
-  Revision 1.3  2000-08-25 17:33:44  hajny
+  Revision 1.4  2000-12-19 00:43:07  hajny
+    + FCL made compilable under OS/2
+
+  Revision 1.3  2000/08/25 17:33:44  hajny
     * Made compilable again (missing bracket at the begin of logs)
 
   Revision 1.2  2000/07/13 11:33:01  michael

fcl/os2/thread.inc

@@ -16,17 +16,18 @@
 {****************************************************************************}
 
 const
- Priorities: array [TThreadPriority] of word = ($100, $200, $207, $20F, $217
+ Priorities: array [TThreadPriority] of word = ($100, $200, $207, $20F, $217,
   $21F, $300);
+ ThreadCount: longint = 0;
 
 
-procedure AddThread;
+procedure AddThread (T: TThread);
 begin
  Inc (ThreadCount);
 end;
 
 
-procedure RemoveThread;
+procedure RemoveThread (T: TThread);
 begin
  Dec (ThreadCount);
 end;
@@ -89,9 +90,10 @@ begin
 end;
 
 
-function ThreadProc(Thread: TThread): Integer; cdecl;
+function ThreadProc(Args: pointer): Integer; cdecl;
 var
   FreeThread: Boolean;
+  Thread: TThread absolute Args;
 begin
   Thread.Execute;
   FreeThread := Thread.FFreeOnTerminate;
@@ -109,7 +111,7 @@ begin
   inherited Create;
   AddThread (Self);
   FSuspended := CreateSuspended;
-  Flags := dtStack_Committed;
+  Flags := dtStack_Commited;
   if FSuspended then Flags := Flags or dtSuspended;
   if DosCreateThread (FThreadID, @ThreadProc, pointer (Self), Flags, 16384)
                                                                       <> 0 then
@@ -159,7 +161,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:02  michael
+  Revision 1.3  2000-12-19 00:43:07  hajny
+    + FCL made compilable under OS/2
+
+  Revision 1.2  2000/07/13 11:33:02  michael
   + removed logs
  
 }