summaryrefslogtreecommitdiff
path: root/codegen/valagvariantmodule.vala
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2021-02-04 21:07:17 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2021-02-04 21:33:07 +0100
commit05966d512de99b562807f8b186c285b46da93f0c (patch)
tree6cf48ab75dcb0dcd55d20ffab0d50bc11a0fdb08 /codegen/valagvariantmodule.vala
parentadee674eb14db9cad3e52d9200bbe44f0ef3b17d (diff)
downloadvala-05966d512de99b562807f8b186c285b46da93f0c.tar.gz
codegen: Replace "g_memdup" with "_vala_memdup2" for target glib < 2.68
"_vala_memdup2" is a copy of "g_memdup2" available in glib >= 2.68
Diffstat (limited to 'codegen/valagvariantmodule.vala')
-rw-r--r--codegen/valagvariantmodule.vala9
1 files changed, 6 insertions, 3 deletions
diff --git a/codegen/valagvariantmodule.vala b/codegen/valagvariantmodule.vala
index 4d3c692a8..808af51b1 100644
--- a/codegen/valagvariantmodule.vala
+++ b/codegen/valagvariantmodule.vala
@@ -422,7 +422,8 @@ public class Vala.GVariantModule : GValueModule {
if (context.require_glib_version (2, 68)) {
dup_call = new CCodeFunctionCall (new CCodeIdentifier ("g_memdup2"));
} else {
- dup_call = new CCodeFunctionCall (new CCodeIdentifier ("g_memdup"));
+ requires_memdup2 = true;
+ dup_call = new CCodeFunctionCall (new CCodeIdentifier ("_vala_memdup2"));
}
dup_call.add_argument (get_data_call);
dup_call.add_argument (length);
@@ -568,7 +569,8 @@ public class Vala.GVariantModule : GValueModule {
if (context.require_glib_version (2, 68)) {
cdup = new CCodeFunctionCall (new CCodeIdentifier ("g_memdup2"));
} else {
- cdup = new CCodeFunctionCall (new CCodeIdentifier ("g_memdup"));
+ requires_memdup2 = true;
+ cdup = new CCodeFunctionCall (new CCodeIdentifier ("_vala_memdup2"));
}
cdup.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, result));
cdup.add_argument (csizeof);
@@ -745,7 +747,8 @@ public class Vala.GVariantModule : GValueModule {
if (context.require_glib_version (2, 68)) {
dup_call = new CCodeFunctionCall (new CCodeIdentifier ("g_memdup2"));
} else {
- dup_call = new CCodeFunctionCall (new CCodeIdentifier ("g_memdup"));
+ requires_memdup2 = true;
+ dup_call = new CCodeFunctionCall (new CCodeIdentifier ("_vala_memdup2"));
}
dup_call.add_argument (array_expr);
dup_call.add_argument (get_array_length (array_expr, 1));