paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-17 21:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: macros: fixed AV, bug #18158

Browse Source 
git-svn-id: trunk@28636 -
This commit is contained in:
mattias 2010-12-06 09:01:31 +00:00
parent 7eb089fd4d
commit 2ce4a945bb
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/printers/Makefile.compiled
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fuunix;win32;carbon;qt;../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fiunix;win32;carbon;qt;. -dUseCache -dNativePrint -dLCL -dLCL%(LCL_PLATFORM)"/>
<Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fuunix;win32;carbon;qt;../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fiunix;win32;carbon;qt;. -dUseCache -dNativePrint -dLCL -dLCL%(LCL_PLATFORM) printer4lazarus.pas"/>
</CONFIG>

2
components/rtticontrols/Makefile.compiled
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fu../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM)"/>
<Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fu../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM) runtimetypeinfocontrols.pas"/>
</CONFIG>

2
components/sqldb/Makefile.compiled
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<CONFIG>
<Makefile Value="True"/>
<Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fu../synedit/units/%(CPU_TARGET)-%(OS_TARGET);../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM)"/>
<Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fu../synedit/units/%(CPU_TARGET)-%(OS_TARGET);../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM) sqldblaz.pas"/>
</CONFIG>

18
ide/transfermacros.pp
View File

@ -357,14 +357,16 @@ begin
length(MacroStr)-length(MacroName)-3);
AMacro:=FindByName(MacroName);
InUse:=0;
for i:=0 to fBusy.Count-1 do begin
if SysUtils.CompareText(fBusy[i],MacroName)=0 then begin
inc(InUse);
if InUse>MaxUsePerMacro then begin
// circle detected
Handled:=true;
MacroStr:='<CIRCLE:'+MacroName+'>';
break;
if fBusy<>nil then begin
for i:=0 to fBusy.Count-1 do begin
if SysUtils.CompareText(fBusy[i],MacroName)=0 then begin
inc(InUse);
if InUse>MaxUsePerMacro then begin
// circle detected
Handled:=true;
MacroStr:='<CIRCLE:'+MacroName+'>';
break;
end;
end;
end;
end;