From fd86e14b01d6465f8e5c6f1936b14f8dc76a6def Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 16 Dec 2003 09:43:04 +0000 Subject: [PATCH] * Use of 0 instead of nil fixed --- rtl/inc/generic.inc | 9 ++++++--- rtl/linux/ossysc.inc | 7 +++++-- rtl/unix/cthreads.pp | 13 ++++++++----- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/rtl/inc/generic.inc b/rtl/inc/generic.inc index 50e9c395ab..6756478148 100644 --- a/rtl/inc/generic.inc +++ b/rtl/inc/generic.inc @@ -408,9 +408,9 @@ begin begin ppointer(_self+vmt_pos)^:=nil; freemem(_self); - { reset _vmt to 0 so it will not be freed a + { reset _vmt to nil so it will not be freed a second time } - _vmt:=0; + _vmt:=nil; end; end else @@ -1014,7 +1014,10 @@ end; { $Log$ - Revision 1.62 2003-12-06 13:25:30 jonas + Revision 1.63 2003-12-16 09:43:04 daniel + * Use of 0 instead of nil fixed + + Revision 1.62 2003/12/06 13:25:30 jonas * fixed longint/cardinal comparison in int_str Revision 1.61 2003/09/03 14:09:37 florian diff --git a/rtl/linux/ossysc.inc b/rtl/linux/ossysc.inc index faa4e31081..a03a26c38e 100644 --- a/rtl/linux/ossysc.inc +++ b/rtl/linux/ossysc.inc @@ -382,7 +382,7 @@ end; Function sbrk(size : longint) : pointer; begin - sbrk:=Fpmmap(0,Size,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0); + sbrk:=Fpmmap(nil,Size,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0); if sbrk=pointer(-1) then sbrk:=nil else @@ -454,7 +454,10 @@ end; { $Log$ - Revision 1.9 2003-10-17 20:56:24 olle + Revision 1.10 2003-12-16 09:43:04 daniel + * Use of 0 instead of nil fixed + + Revision 1.9 2003/10/17 20:56:24 olle * Changed m68k to cpum68k, i386 to cpui386 Revision 1.8 2003/09/27 13:45:58 peter diff --git a/rtl/unix/cthreads.pp b/rtl/unix/cthreads.pp index 0a7b2e1493..c1d28e2387 100644 --- a/rtl/unix/cthreads.pp +++ b/rtl/unix/cthreads.pp @@ -85,7 +85,7 @@ Uses { exceptions which use threadvars but } { these aren't allocated yet ... } { allocate room on the heap for the thread vars } - DataIndex:=Pointer(Fpmmap(0,threadvarblocksize,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0)); + DataIndex:=Pointer(Fpmmap(nil,threadvarblocksize,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0)); FillChar(DataIndex^,threadvarblocksize,0); pthread_setspecific(tlskey,dataindex); end; @@ -289,10 +289,10 @@ Uses begin m_spinlock:=0; m_count:=0; - m_owner:=0; + m_owner:=nil; m_kind:=1; - m_waiting.head:=0; - m_waiting.tail:=0; + m_waiting.head:=nil; + m_waiting.tail:=nil; end; pthread_mutex_init(P,NIL); end; @@ -416,7 +416,10 @@ initialization end. { $Log$ - Revision 1.4 2003-11-29 17:34:14 michael + Revision 1.5 2003-12-16 09:43:04 daniel + * Use of 0 instead of nil fixed + + Revision 1.4 2003/11/29 17:34:14 michael + Removed dummy variable from SetCthreadManager Revision 1.3 2003/11/27 20:24:53 michael