--- Merging r33038 into '.':

U    rtl/inc/heaptrc.pp
--- Recording mergeinfo for merge of r33038 into '.':
 U   .
--- Merging r35886 into '.':
U    rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r35886 into '.':
 G   .

# revisions: 33038,35886

git-svn-id: branches/fixes_3_0@36046 -

rtl/inc/exeinfo.pp

@@ -23,8 +23,6 @@
 
 {$checkpointer off}
 
-{$mode objfpc}
-
 unit exeinfo;
 interface
 

rtl/inc/heaptrc.pp

@@ -86,7 +86,7 @@ const
   printleakedblock: boolean = false;
   printfaultyblock: boolean = false;
   maxprintedblocklength: integer = 128;
-  
+
   GlobalSkipIfNoLeaks : Boolean = False;
 
 implementation
@@ -513,7 +513,7 @@ begin
   { clear the memory }
   fillchar(p^,size,#255);
   { retrieve backtrace info }
-  CaptureBacktrace(1,tracesize-1,@pp^.calls[1]);
+  CaptureBacktrace(1,tracesize,@pp^.calls[1]);
 
   { insert in the linked list }
   if loc_info^.heap_mem_root<>nil then
@@ -869,7 +869,7 @@ begin
   inc(loc_info^.getmem_size,size);
   inc(loc_info^.getmem8_size,(size+7) and not 7);
   { generate new backtrace }
-  CaptureBacktrace(1,tracesize-1,@pp^.calls[1]);
+  CaptureBacktrace(1,tracesize,@pp^.calls[1]);
   { regenerate signature }
   if usecrc then
     pp^.sig:=calculate_sig(pp);
@@ -1129,7 +1129,7 @@ begin
   else
     ptext:=textoutput;
   pp:=loc_info^.heap_mem_root;
-  if ((loc_info^.getmem_size-loc_info^.freemem_size)=0) and SkipIfNoLeaks then 
+  if ((loc_info^.getmem_size-loc_info^.freemem_size)=0) and SkipIfNoLeaks then
     exit;
   Writeln(ptext^,'Heap dump by heaptrc unit');
   Writeln(ptext^,loc_info^.getmem_cnt, ' memory blocks allocated : ',