From: Jürg Billeter <j@bitron.ch>
Date: Sat, 20 Mar 2010 20:55:02 +0000 (+0100)
Subject: Avoid GPOINTER_TO_* macros with va_arg
X-Git-Tag: 0.8.0~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92c3780738f99c7f060adc65c1f150b895453a03;p=thirdparty%2Fvala.git

Avoid GPOINTER_TO_* macros with va_arg
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index c3a30f8fa..4eecd3809 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -3444,8 +3444,9 @@ internal class Vala.CCodeBaseModule : CCodeModule {
 	public override void visit_expression (Expression expr) {
 		if (expr.ccodenode != null && !expr.lvalue) {
 			if (expr.formal_value_type is GenericType && !(expr.value_type is GenericType)) {
-				if (expr.formal_value_type.type_parameter.parent_symbol != garray_type /*&&
-				    expr.formal_value_type.type_parameter.parent_symbol != va_list_type*/) {
+				var st = expr.formal_value_type.type_parameter.parent_symbol.parent_symbol as Struct;
+				if (expr.formal_value_type.type_parameter.parent_symbol != garray_type &&
+				    (st == null || st.get_cname () != "va_list")) {
 					// GArray and va_list don't use pointer-based generics
 					expr.ccodenode = convert_from_generic_pointer ((CCodeExpression) expr.ccodenode, expr.value_type);
 				}