From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 18 Oct 2019 22:12:26 +0000 (+0200)
Subject: codegen: Replace hardcoded "gboolean" references (POSIX)
X-Git-Tag: 0.47.1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45d21beaa3d50bd98ee08322084d1237b04d384d;p=thirdparty%2Fvala.git

codegen: Replace hardcoded "gboolean" references (POSIX)

Only applied up to CCodeDelegateModule
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 06830c981..7e0676e21 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2873,7 +2873,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			return equal_func;
 		}
 
-		var function = new CCodeFunction (equal_func, "gboolean");
+		var function = new CCodeFunction (equal_func, get_ccode_name (bool_type));
 		function.modifiers = CCodeModifiers.STATIC;
 
 		function.add_parameter (new CCodeParameter ("s1", "const %s *".printf (get_ccode_name (st))));
@@ -2970,7 +2970,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			return equal_func;
 		}
 
-		var function = new CCodeFunction (equal_func, "gboolean");
+		var function = new CCodeFunction (equal_func, get_ccode_name (bool_type));
 		function.modifiers = CCodeModifiers.STATIC;
 
 		function.add_parameter (new CCodeParameter ("s1", "const %s *".printf (get_ccode_name (sym))));
@@ -3389,7 +3389,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
 			CCodeFunctionCall element_free_call;
 			string destroy_node_func = "%s_node".printf (destroy_func);
-			var wrapper = new CCodeFunction (destroy_node_func, "gboolean");
+			var wrapper = new CCodeFunction (destroy_node_func, get_ccode_name (bool_type));
 			wrapper.modifiers = CCodeModifiers.STATIC;
 			wrapper.add_parameter (new CCodeParameter ("node", get_ccode_name (collection_type)));
 			wrapper.add_parameter (new CCodeParameter ("free_func", "GDestroyNotify"));
@@ -5607,7 +5607,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			return array_contains_func;
 		}
 
-		var function = new CCodeFunction (array_contains_func, "gboolean");
+		var function = new CCodeFunction (array_contains_func, get_ccode_name (bool_type));
 		function.modifiers = CCodeModifiers.STATIC;
 
 		function.add_parameter (new CCodeParameter ("stack", "%s *".printf (get_ccode_name (array_type.element_type))));
diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 0cb669125..acbc6ae65 100644
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -450,7 +450,7 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
 				}
 			} else {
 				if (m.body != null) {
-					function = new CCodeFunction (real_name + "_co", "gboolean");
+					function = new CCodeFunction (real_name + "_co", get_ccode_name (bool_type));
 
 					// data struct to hold parameters, local variables, and the return value
 					function.add_parameter (new CCodeParameter ("_data_", Symbol.lower_case_to_camel_case (get_ccode_const_name (m)) + "Data*"));