Selaa lähdekoodia

* removed warnings

peter 26 vuotta sitten
vanhempi
commit
5fec122056
5 muutettua tiedostoa jossa 26 lisäystä ja 19 poistoa
  1. 2 4
      base/Makefile
  2. 1 3
      base/Makefile.fpc
  3. 7 2
      rtl/inc/heaptrc.pp
  4. 12 5
      rtl/linux/linux.pp
  5. 4 5
      rtl/linux/sockets.pp

+ 2 - 4
base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-14 17:43
+# Makefile generated by fpcmake v0.99.13 on 1999-11-14 19:23
 #
 
 defaultrule: info
@@ -912,7 +912,7 @@ MODULES+=$(wildcard ide)
 ###############################
 
 ifndef RTLDIR
-RTLDIR=rtl
+RTLDIR=rtl/$(OS_TARGET)
 endif
 
 ifndef COMPILERDIR
@@ -1002,8 +1002,6 @@ sharedinstall: $(addsuffix _sharedinstall,$(MODULES))
 # RTL
 #######################################
 
-override RTLDIR:=$(RTLDIR)/$(OS_TARGET)
-
 rtl_all:
 	$(MAKE) -C $(RTLDIR) all
 

+ 1 - 3
base/Makefile.fpc

@@ -26,7 +26,7 @@ MODULES+=$(wildcard ide)
 ###############################
 
 ifndef RTLDIR
-RTLDIR=rtl
+RTLDIR=rtl/$(OS_TARGET)
 endif
 
 ifndef COMPILERDIR
@@ -116,8 +116,6 @@ sharedinstall: $(addsuffix _sharedinstall,$(MODULES))
 # RTL
 #######################################
 
-override RTLDIR:=$(RTLDIR)/$(OS_TARGET)
-
 rtl_all:
         $(MAKE) -C $(RTLDIR) all
 

+ 7 - 2
rtl/inc/heaptrc.pp

@@ -545,7 +545,9 @@ var
    edata : cardinal; external name 'edata';
 {$endif go32v2}
 
-{$S-}
+{$ifndef linux}
+  {$S-}
+{$endif}
 
 var
    heap_at_init : pointer;
@@ -930,7 +932,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.28  1999-11-09 22:32:23  pierre
+  Revision 1.29  1999-11-14 21:35:04  peter
+    * removed warnings
+
+  Revision 1.28  1999/11/09 22:32:23  pierre
    * several extra_size_info fixes
 
   Revision 1.27  1999/11/06 14:35:38  peter

+ 12 - 5
rtl/linux/linux.pp

@@ -1922,10 +1922,14 @@ Function Dup2(var oldfile,newfile:text):Boolean;
 var
   tmphandle : word;
 begin
-  if TextRec(oldfile).mode in [fmOutput, fmInOut, fmAppend] then
-    flush(oldfile);{ We cannot share buffers, so we flush them. }
-  if TextRec(newfile).mode in [fmOutput, fmInOut, fmAppend] then
-    flush(newfile);
+  case TextRec(oldfile).mode of
+    fmOutput, fmInOut, fmAppend :
+      flush(oldfile);{ We cannot share buffers, so we flush them. }
+  end;
+  case TextRec(newfile).mode of
+    fmOutput, fmInOut, fmAppend :
+      flush(newfile);
+  end;
   tmphandle:=textrec(newfile).handle;
   textrec(newfile):=textrec(oldfile);
   textrec(newfile).handle:=tmphandle;
@@ -3810,7 +3814,10 @@ End.
 
 {
   $Log$
-  Revision 1.52  1999-11-14 11:11:15  michael
+  Revision 1.53  1999-11-14 21:35:04  peter
+    * removed warnings
+
+  Revision 1.52  1999/11/14 11:11:15  michael
   + Added Pause() and alarm()
 
   Revision 1.51  1999/11/11 19:43:49  sg

+ 4 - 5
rtl/linux/sockets.pp

@@ -295,9 +295,6 @@ end;
 
 
 Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:text):Boolean;
-
-Var FD : Longint;
-
 begin
   Connect:=DoConnect(Sock,addr);
   If Connect then
@@ -307,7 +304,6 @@ end;
 
 
 Function Connect(Sock:longint;const addr:string;var SockIn,SockOut:file):Boolean;
-
 begin
   Connect:=DoConnect(Sock,addr);
   if Connect then
@@ -320,7 +316,10 @@ end.
 
 {
   $Log$
-  Revision 1.9  1999-07-03 15:16:47  michael
+  Revision 1.10  1999-11-14 21:35:04  peter
+    * removed warnings
+
+  Revision 1.9  1999/07/03 15:16:47  michael
   + Fixed Connect call
 
   Revision 1.8  1999/06/27 16:04:25  michael