From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 6 Mar 2020 21:47:54 +0000 (+0100)
Subject: codegen: Replace hard-coded "gsize" with resolved "size_t"
X-Git-Tag: 0.48.1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9772eddcc42533b52155e599b6a91ecc314471d7;p=thirdparty%2Fvala.git

codegen: Replace hard-coded "gsize" with resolved "size_t"
---

diff --git a/codegen/valaccodearraymodule.vala b/codegen/valaccodearraymodule.vala
index 0f2e60147..8fa9e1c18 100644
--- a/codegen/valaccodearraymodule.vala
+++ b/codegen/valaccodearraymodule.vala
@@ -347,7 +347,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
 		var fun = new CCodeFunction ("_vala_array_move", "void");
 		fun.modifiers = CCodeModifiers.STATIC;
 		fun.add_parameter (new CCodeParameter ("array", get_ccode_name (pointer_type)));
-		fun.add_parameter (new CCodeParameter ("element_size", "gsize"));
+		fun.add_parameter (new CCodeParameter ("element_size", get_ccode_name (size_t_type)));
 		fun.add_parameter (new CCodeParameter ("src", get_ccode_name (int_type)));
 		fun.add_parameter (new CCodeParameter ("dest", get_ccode_name (int_type)));
 		fun.add_parameter (new CCodeParameter ("length", get_ccode_name (int_type)));
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 7ca0d007f..5dfadecbc 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -313,6 +313,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 	public DataType uint32_type;
 	public DataType int64_type;
 	public DataType uint64_type;
+	public DataType size_t_type;
 	public DataType string_type;
 	public DataType regex_type;
 	public DataType float_type;
@@ -472,6 +473,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 		uint32_type = new IntegerType ((Struct) root_symbol.scope.lookup ("uint32"));
 		int64_type = new IntegerType ((Struct) root_symbol.scope.lookup ("int64"));
 		uint64_type = new IntegerType ((Struct) root_symbol.scope.lookup ("uint64"));
+		size_t_type = new IntegerType ((Struct) root_symbol.scope.lookup ("size_t"));
 		float_type = new FloatingType ((Struct) root_symbol.scope.lookup ("float"));
 		double_type = new FloatingType ((Struct) root_symbol.scope.lookup ("double"));
 		string_type = new ObjectType ((Class) root_symbol.scope.lookup ("string"));