Browse Source

* some warnings fixed

florian 27 years ago
parent
commit
ba18c26dda
3 changed files with 21 additions and 13 deletions
  1. 9 8
      rtl/dos/go32v2/makefile
  2. 7 2
      rtl/dos/graph.pp
  3. 5 3
      rtl/dos/ppi/global.ppi

+ 9 - 8
rtl/dos/go32v2/makefile

@@ -131,7 +131,7 @@ endif
 SYSTEMDEPS=$(INC)/system.inc $(INC)/systemh.inc $(INC)/mathh.inc $(INC)/real2str.inc \
 SYSTEMDEPS=$(INC)/system.inc $(INC)/systemh.inc $(INC)/mathh.inc $(INC)/real2str.inc \
 	$(INC)/heaph.inc $(INC)/innr.inc $(INC)/sstrings.inc $(INC)/file.inc \
 	$(INC)/heaph.inc $(INC)/innr.inc $(INC)/sstrings.inc $(INC)/file.inc \
 	$(INC)/text.inc $(INC)/typefile.inc $(INC)/version.inc $(INC)/filerec.inc \
 	$(INC)/text.inc $(INC)/typefile.inc $(INC)/version.inc $(INC)/filerec.inc \
-	$(INC)/textrec.inc $(INC)/objpas.inc $(INC)/objpash.inc \
+        $(INC)/textrec.inc \
 	$(PROCINC)/math.inc $(PROCINC)/set.inc $(PROCINC)/heap.inc $(PROCINC)/$(CPU).inc
 	$(PROCINC)/math.inc $(PROCINC)/set.inc $(PROCINC)/heap.inc $(PROCINC)/$(CPU).inc
 
 
 PPUEXT=.ppu
 PPUEXT=.ppu
@@ -206,8 +206,8 @@ system$(PPUEXT) : system.pp $(SYSTEMDEPS)
 	$(COPY) $(INC)/*.inc $(PROCINC)/*.inc .
 	$(COPY) $(INC)/*.inc $(PROCINC)/*.inc .
 	$(PP) $(OPT) -dI386 -Us -Sg system $(REDIR)
 	$(PP) $(OPT) -dI386 -Us -Sg system $(REDIR)
 	$(DEL) systemh.inc system.inc real2str.inc version.inc $(CPU).inc sstrings.inc
 	$(DEL) systemh.inc system.inc real2str.inc version.inc $(CPU).inc sstrings.inc
-	$(DEL) mathh.inc math.inc set.inc innr.inc heap.inc heaph.inc objpash.inc
-	$(DEL) filerec.inc textrec.inc file.inc typefile.inc text.inc objpas.inc
+	$(DEL) mathh.inc math.inc set.inc innr.inc heap.inc heaph.inc
+	$(DEL) filerec.inc textrec.inc file.inc typefile.inc text.inc
 
 
 prt0$(OEXT) : v2prt0.as
 prt0$(OEXT) : v2prt0.as
 	as -o prt0$(OEXT) v2prt0.as
 	as -o prt0$(OEXT) v2prt0.as
@@ -234,11 +234,6 @@ cpu$(PPUEXT) : ../../i386/cpu.pp system$(PPUEXT)
 	$(PP) $(OPT) cpu $(REDIR)
 	$(PP) $(OPT) cpu $(REDIR)
 	$(DEL) cpu.pp
 	$(DEL) cpu.pp
 
 
-objpas$(PPUEXT) : ../../objpas/objpas.pp system$(PPUEXT)
-	$(COPY) ../../objpas/objpas.pp .
-	$(PP) $(OPT) objpas $(REDIR)
-	$(DEL) objpas.pp
-
 objects$(PPUEXT) : ../objects.pp system$(PPUEXT)
 objects$(PPUEXT) : ../objects.pp system$(PPUEXT)
 	$(COPY) ../objects.pp .
 	$(COPY) ../objects.pp .
 	$(PP) $(OPT) objects $(REDIR)
 	$(PP) $(OPT) objects $(REDIR)
@@ -249,6 +244,12 @@ mouse$(PPUEXT) : ../mouse.pp system$(PPUEXT)
 	$(PP) $(OPT) mouse $(REDIR)
 	$(PP) $(OPT) mouse $(REDIR)
 	$(DEL) mouse.pp
 	$(DEL) mouse.pp
 
 
+objpas$(PPUEXT) : ../../objpas/objpas.pp system$(PPUEXT)
+	$(COPY) ../../objpas/objpas.pp .
+	$(PP) $(OPT) objpas $(REDIR)
+	$(DEL) objpas.pp
+
+
 fmouse$(PPUEXT) : ../fmouse.pp system$(PPUEXT)
 fmouse$(PPUEXT) : ../fmouse.pp system$(PPUEXT)
 	$(COPY) ../fmouse.pp .
 	$(COPY) ../fmouse.pp .
 	$(PP) $(OPT) fmouse $(REDIR)
 	$(PP) $(OPT) fmouse $(REDIR)

+ 7 - 2
rtl/dos/graph.pp

@@ -654,10 +654,12 @@ end;
 
 
 function RegisterBGIdriver(driver : pointer) : integer;
 function RegisterBGIdriver(driver : pointer) : integer;
 begin
 begin
+   RegisterBGIdriver:=grerror;
 end;
 end;
 
 
 function InstallUserDriver(const DriverFileName : string;AutoDetectPtr : pointer) : integer;
 function InstallUserDriver(const DriverFileName : string;AutoDetectPtr : pointer) : integer;
 begin
 begin
+   installuserdriver:=grerror;
 end;
 end;
 
 
 function GetMaxMode:Integer;
 function GetMaxMode:Integer;
@@ -822,8 +824,11 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.1  1998-03-25 11:18:41  root
-  Initial revision
+  Revision 1.2  1998-03-26 10:41:15  florian
+    * some warnings fixed
+
+  Revision 1.1.1.1  1998/03/25 11:18:41  root
+  * Restored version
 
 
   Revision 1.7  1998/03/03 22:48:41  florian
   Revision 1.7  1998/03/03 22:48:41  florian
     + graph.drawpoly procedure
     + graph.drawpoly procedure

+ 5 - 3
rtl/dos/ppi/global.ppi

@@ -11,7 +11,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
-{$E-}
 {$PACKRECORDS NORMAL}
 {$PACKRECORDS NORMAL}
 
 
     const
     const
@@ -189,8 +188,11 @@
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.1  1998-03-25 11:18:42  root
-  Initial revision
+  Revision 1.2  1998-03-26 10:41:15  florian
+    * some warnings fixed
+
+  Revision 1.1.1.1  1998/03/25 11:18:42  root
+  * Restored version
 
 
   Revision 1.4  1998/03/03 22:48:42  florian
   Revision 1.4  1998/03/03 22:48:42  florian
     + graph.drawpoly procedure
     + graph.drawpoly procedure