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 a23d4c13cca0042d6c944a094c14d75f86213fbb..18cda12a12b3103b5a3054028bc10c75a9a9bbc9 100644 (file)
--- 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 792d5f0114b7d7af9e1fb283f3f4ae74020e6952..7c389b929375ef722aea74d5df432d87c272a6e8 100644 (file)
--- 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 = "";