From f9840ae34ae63fccf4fc6a2d8c63c5b7c7b044c0 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 5 Jul 2010 07:41:47 +0000
Subject: [PATCH] IDE: when changing build IDE extra options, invalidate
 macros, bug #16844

git-svn-id: trunk@26467 -
---
 components/codetools/codetools.lpk        | 6 ++++--
 components/codetools/pascalreadertool.pas | 2 ++
 ide/buildlazdialog.pas                    | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/codetools/codetools.lpk b/components/codetools/codetools.lpk
index 033e15beb0..c8b4d3d569 100644
--- a/components/codetools/codetools.lpk
+++ b/components/codetools/codetools.lpk
@@ -5,20 +5,22 @@
     <AddToProjectUsesSection Value="False"/>
     <Author Value="Mattias Gaertner"/>
     <CompilerOptions>
-      <Version Value="8"/>
+      <Version Value="9"/>
       <SearchPaths>
         <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Parsing>
         <SyntaxOptions>
           <AllowLabel Value="False"/>
+          <UseAnsiStrings Value="False"/>
         </SyntaxOptions>
       </Parsing>
       <Other>
         <Verbosity>
           <ShowHints Value="False"/>
         </Verbosity>
-        <CustomOptions Value="$(IDEBuildOptions)"/>
+        <CustomOptions Value="$(IDEBuildOptions)
+"/>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
diff --git a/components/codetools/pascalreadertool.pas b/components/codetools/pascalreadertool.pas
index 66e6996487..0014c2fed7 100644
--- a/components/codetools/pascalreadertool.pas
+++ b/components/codetools/pascalreadertool.pas
@@ -1941,6 +1941,7 @@ function TPascalReaderTool.FindForwardTypeNode(TypeNode: TCodeTreeNode;
 
   function Next: TCodeTreeNode;
   begin
+    Result:=FindForwardTypeNode;
     if Result.PriorBrother<>nil then
       // search upwards
       Result:=Result.PriorBrother
@@ -2002,6 +2003,7 @@ function TPascalReaderTool.FindTypeOfForwardNode(TypeNode: TCodeTreeNode
 
   function Next: TCodeTreeNode;
   begin
+    Result:=FindTypeOfForwardNode;
     if Result.NextBrother<>nil then
       // search forwards
       Result:=Result.NextBrother
diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index e315968125..d4b4903b63 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -304,6 +304,7 @@ function ShowConfigureBuildLazarusDlg(
 // mrYes=save and compile
 var
   ConfigBuildLazDlg: TConfigureBuildLazarusDlg;
+  OldExtraOptions: String;
 begin
   Result := mrCancel;
   ConfigBuildLazDlg := TConfigureBuildLazarusDlg.Create(nil);
@@ -313,7 +314,10 @@ begin
     if Result in [mrOk,mrYes]
     then begin
       //DebugLn('ShowConfigureBuildLazarusDialog');
+      OldExtraOptions:=AOptions.ExtraOptions;
       AOptions.Assign(ConfigBuildLazDlg.Options);
+      if OldExtraOptions<>AOptions.ExtraOptions then
+        IncreaseCompilerParseStamp;
     end;
   finally
     ConfigBuildLazDlg.Free;