2008-11-17 Marek Safar <marek.safar@gmail.com>

	A fix for bug #445303
	* location.cs (IsConditionalDefined): Handle undefined global
	defines.

svn path=/branches/mono-2-2/mcs/; revision=119040

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 25baa6652acbd642d525700f6a8ba90c1f95acb1..fc2d4f5704019408c3d3a4bebd9b74e7ac635c27 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-17  Marek Safar  <marek.safar@gmail.com>
+
+       A fix for bug #445303
+       * location.cs (IsConditionalDefined): Handle undefined global
+       defines.
+
 2008-11-17  Marek Safar  <marek.safar@gmail.com>
 
        A fix for bug #444678

diff --git a/mcs/mcs/location.cs b/mcs/mcs/location.cs
index cf7fd26a203dad1c3132255c6022c5941d15cff5..45f922ddf45c440f30d368a14ccffa37d67d8dc5 100644 (file)
--- a/mcs/mcs/location.cs
+++ b/mcs/mcs/location.cs
@@ -135,6 +135,10 @@ namespace Mono.CSharp {
                                object res = conditionals [value];
                                if (res != null)
                                        return (bool)res;
+                               
+                               // When conditional was undefined
+                               if (conditionals.Contains (value))
+                                       return false;                                   
                        }
 
                        return RootContext.IsConditionalDefined (value);