Parcourir la source

Merged revisions 4520,4524,4526 via svnmerge from
svn+ssh://svn.freepascal.org/FPC/svn/fpc/trunk

........
r4520 | Almindor | 2006-08-31 14:53:06 +0200 (do, 31 aug 2006) | 2 lines

* fixes a valgrind-reported mem leak in netdb (freemem vs dispose when new is used)
........
r4524 | Almindor | 2006-08-31 22:48:51 +0200 (do, 31 aug 2006) | 2 lines

* EPOLL_CTL_DEL was flipped with EPOLL_CTL_MOD
........
r4526 | Almindor | 2006-09-01 09:54:48 +0200 (vr, 01 sep 2006) | 2 lines

* fixed EPOLLOUT vs EPOLLPRI mixup in constants
........

git-svn-id: branches/fixes_2_0@4556 -

micha il y a 19 ans
Parent
commit
ccbda24a6b
2 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 1 1
      packages/base/netdb/netdb.pp
  2. 4 4
      rtl/linux/linux.pp

+ 1 - 1
packages/base/netdb/netdb.pp

@@ -333,7 +333,7 @@ begin
     begin
     Inc(Result);
     P:=List^.Next;
-    FreeMem(List);
+    Dispose(List);
     List:=P;
     end;
 end;

+ 4 - 4
rtl/linux/linux.pp

@@ -50,16 +50,16 @@ Const
   CLONE_PID     = $00001000; // set if pid shared
 
   EPOLLIN  = $01; { The associated file is available for read(2) operations. }
-  EPOLLOUT = $02; { The associated file is available for write(2) operations. }
-  EPOLLPRI = $04; { There is urgent data available for read(2) operations. }
+  EPOLLPRI = $02; { There is urgent data available for read(2) operations. }
+  EPOLLOUT = $04; { The associated file is available for write(2) operations. }
   EPOLLERR = $08; { Error condition happened on the associated file descriptor. }
   EPOLLHUP = $10; { Hang up happened on the associated file descriptor. }
   EPOLLET  = $80000000; { Sets  the  Edge  Triggered  behaviour  for  the  associated file descriptor. }
 
   { Valid opcodes ( "op" parameter ) to issue to epoll_ctl }
   EPOLL_CTL_ADD = 1;
-  EPOLL_CTL_MOD = 2;
-  EPOLL_CTL_DEL = 3;
+  EPOLL_CTL_DEL = 2;
+  EPOLL_CTL_MOD = 3;
 
   {Some console iotcl's.}
   GIO_FONT        = $4B60;  {gets font in expanded form}