Bläddra i källkod

* DosCalls not using Objects any more

Tomas Hajny 22 år sedan
förälder
incheckning
b6748277ed
3 ändrade filer med 10 tillägg och 26 borttagningar
  1. 2 2
      rtl/os2/Makefile
  2. 2 2
      rtl/os2/Makefile.fpc
  3. 6 22
      rtl/os2/doscalls.pas

+ 2 - 2
rtl/os2/Makefile

@@ -1206,7 +1206,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
 		   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
 		   $(SYSTEMUNIT)$(PPUEXT)
 ports$(PPUEXT) : ports.pas objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
-doscalls$(PPUEXT) : doscalls.pas strings$(PPUEXT) objects$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+doscalls$(PPUEXT) : doscalls.pas strings$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 kbdcalls$(PPUEXT) : kbdcalls.pas $(SYSTEMUNIT)$(PPUEXT)
 moucalls$(PPUEXT) : moucalls.pas $(SYSTEMUNIT)$(PPUEXT)
 moncalls$(PPUEXT) : moncalls.pas strings$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
@@ -1223,7 +1223,7 @@ dynlibs$(PPUEXT) : $(INC)/dynlibs.pp doscalls$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 dos$(PPUEXT) : dos.pas $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \
 	       doscalls$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 crt$(PPUEXT) : crt.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
-objects$(PPUEXT) : $(INC)/objects.pp $(SYSTEMUNIT)$(PPUEXT)
+objects$(PPUEXT) : $(INC)/objects.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \
 		    objpas$(PPUEXT) dos$(PPUEXT) doscalls$(PPUEXT)

+ 2 - 2
rtl/os2/Makefile.fpc

@@ -102,7 +102,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
 
 ports$(PPUEXT) : ports.pas objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 
-doscalls$(PPUEXT) : doscalls.pas strings$(PPUEXT) objects$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+doscalls$(PPUEXT) : doscalls.pas strings$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 
 kbdcalls$(PPUEXT) : kbdcalls.pas $(SYSTEMUNIT)$(PPUEXT)
 
@@ -139,7 +139,7 @@ dos$(PPUEXT) : dos.pas $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \
 
 crt$(PPUEXT) : crt.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
 
-objects$(PPUEXT) : $(INC)/objects.pp $(SYSTEMUNIT)$(PPUEXT)
+objects$(PPUEXT) : $(INC)/objects.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 
 printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
 

+ 6 - 22
rtl/os2/doscalls.pas

@@ -17,32 +17,13 @@
 
 unit DosCalls;
 
-{****************************************************************************
-                           Preprocessor definitions
-****************************************************************************}
-
-
-{$IFNDEF FVISION_PSTRING}
-{$IFNDEF OWN_PSTRING}
-{$DEFINE FVISION_PSTRING}       {Get the PString type from Free Vision.}
-{$ENDIF}
-{$ENDIF}
-
 {***************************************************************************}
 interface
 {***************************************************************************}
 
-{$IFDEF OWN_PSTRING}
 uses    Strings;
 
-type    PString=^string;
-{$ELSE}
- {$IFDEF FVISION_PSTRING}
-uses    Strings,Objects;
- {$ELSE}
-    {$ERROR PString source unknown.}
- {$ENDIF}
-{$ENDIF}
+type    PString = PShortString;
 
 {$PACKRECORDS 1}
 
@@ -93,7 +74,7 @@ const   dtSuspended         =1; {Thread is started suspended instead of
  Flags      = Flags. Either dtsuspended or dt_stackcommited.
  StackSize  = Size of the stack of the new thread.}
 function DosCreateThread (var TID: longint; Address: TThreadEntry;
-                   AParam: pointer; Flags, StackSize: longint): longint; cdecl;
+                 AParam: pointer; Flags, StackSize: longint): longint; cdecl;
 
 (* Overloaded version for compatibility. *)
 function DosCreateThread (var TID: longint; Address: pointer;
@@ -4553,7 +4534,10 @@ external 'DOSCALLS' index 582;
 end.
 {
   $Log$
-  Revision 1.18  2002-11-14 21:16:22  hajny
+  Revision 1.19  2003-01-05 16:37:22  hajny
+    * DosCalls not using Objects any more
+
+  Revision 1.18  2002/11/14 21:16:22  hajny
     * corruption from the last commit corrected
 
   Revision 1.17  2002/11/04 21:22:12  hajny