From: Jürg Billeter <j@bitron.ch>
Date: Fri, 17 Oct 2008 14:45:24 +0000 (+0000)
Subject: Use defines also for internal constants to fix string constant
X-Git-Tag: VALA_0_4_0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e27ea1b2d6f2bce3ab488a31702be6bd8d1c2a13;p=thirdparty%2Fvala.git

Use defines also for internal constants to fix string constant

2008-10-17  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodegenerator.vala:

	Use defines also for internal constants to fix string constant
	concatenation

svn path=/trunk/; revision=1856
---

diff --git a/ChangeLog b/ChangeLog
index a23d4c13c..18cda12a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-17  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodegenerator.vala:
+
+	Use defines also for internal constants to fix string constant
+	concatenation
+
 2008-10-17  Jürg Billeter  <j@bitron.ch>
 
 	* vapigen/valagidlparser.vala:
diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index 792d5f011..7c389b929 100644
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -506,9 +506,13 @@ public class Vala.CCodeGenerator : CodeGenerator {
 	public override void visit_constant (Constant c) {
 		c.accept_children (this);
 
-		if (!c.is_internal_symbol () && !(c.type_reference is ArrayType)) {
+		if (!(c.type_reference is ArrayType)) {
 			var cdefine = new CCodeMacroReplacement.with_expression (c.get_cname (), (CCodeExpression) c.initializer.ccodenode);
-			header_type_member_declaration.append (cdefine);
+			if (!c.is_internal_symbol ()) {
+				header_type_member_declaration.append (cdefine);
+			} else {
+				source_type_member_declaration.append (cdefine);
+			}
 		} else {
 			var cdecl = new CCodeDeclaration (c.type_reference.get_const_cname ());
 			var arr = "";