From: Jürg Billeter <j@bitron.ch>
Date: Sat, 5 Jun 2010 12:07:23 +0000 (+0200)
Subject: Do not depend on declaration order for constants
X-Git-Tag: 0.9.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=785c538f95b1fd0d63def6de41204d63a481c075;p=thirdparty%2Fvala.git

Do not depend on declaration order for constants

Fixes bug 618890.
---

diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index f21113ea5..6143a4ffe 100644
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -175,7 +175,9 @@ public class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
 		} else if (expr.symbol_reference is Constant) {
 			var c = (Constant) expr.symbol_reference;
 
-			generate_constant_declaration (c, source_declarations);
+			generate_constant_declaration (c, source_declarations,
+				c.source_reference != null && expr.source_reference != null &&
+				c.source_reference.file == expr.source_reference.file);
 
 			string fn = c.get_full_name ();
 			if (fn == "GLib.Log.FILE") {