diff options
| author | micha <micha@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-09-04 20:53:41 +0000 |
|---|---|---|
| committer | micha <micha@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-09-04 20:53:41 +0000 |
| commit | 10bd2104a779335ea634608b93de6f00bcba9df7 (patch) | |
| tree | f186a03b645b3ba2bd1ba60be7434484f774c553 | |
| parent | 384f16bf66946a27ca2c1e5d1ff54413c3977c09 (diff) | |
| download | fpc-10bd2104a779335ea634608b93de6f00bcba9df7.tar.gz | |
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: http://svn.freepascal.org/svn/fpc/branches/fixes_2_0@4556 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/base/netdb/netdb.pp | 2 | ||||
| -rw-r--r-- | rtl/linux/linux.pp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/base/netdb/netdb.pp b/packages/base/netdb/netdb.pp index 24bbd27c81..31258aa98a 100644 --- a/packages/base/netdb/netdb.pp +++ b/packages/base/netdb/netdb.pp @@ -333,7 +333,7 @@ begin begin Inc(Result); P:=List^.Next; - FreeMem(List); + Dispose(List); List:=P; end; end; diff --git a/rtl/linux/linux.pp b/rtl/linux/linux.pp index 41825c8524..1bcbb35e60 100644 --- a/rtl/linux/linux.pp +++ b/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} |