Fix compiling when compiler doesn't support typeof()

diff --git a/src/lib-dns/test-dns-util.c b/src/lib-dns/test-dns-util.c
index a5c2694aa8b4a59ca7ae94ddfe27f336e90e2eb3..bb7787941397fd8646335b7d3b1e5ec450957b8a 100644 (file)
--- a/src/lib-dns/test-dns-util.c
+++ b/src/lib-dns/test-dns-util.c
@@ -106,7 +106,8 @@ static void test_dns_sort(void)
        array_sort(&arr, arr_dns_compare);
 
        for(size_t i = 0; i < N_ELEMENTS(output); i++) {
-               test_assert_idx(dns_compare(*array_idx(&arr, i), output[i]) == 0, i);
+               const char *const *strp = array_idx(&arr, i);
+               test_assert_idx(dns_compare(*strp, output[i]) == 0, i);
        }
 
        test_end();

diff --git a/src/plugins/dict-ldap/dict-ldap.c b/src/plugins/dict-ldap/dict-ldap.c
index e9d0eb073c2f65622dc86278fe8a5aa80f8773be..0fd9fd8783b794f5882b14b60feef150d88a3c1f 100644 (file)
--- a/src/plugins/dict-ldap/dict-ldap.c
+++ b/src/plugins/dict-ldap/dict-ldap.c
@@ -186,8 +186,11 @@ ldap_dict_build_query(struct ldap_dict *dict, const struct dict_ldap_map *map,
 
        for(size_t i = 0; i < array_count(values) && i < array_count(&(map->ldap_attributes)); i++) {
                struct var_expand_table entry;
-               entry.value = *array_idx(values, i);
-               entry.long_key = *array_idx(&(map->ldap_attributes), i);
+               const char *const *valuep = array_idx(values, i);
+               const char *const *long_keyp = array_idx(&(map->ldap_attributes), i);
+
+               entry.value = *valuep;
+               entry.long_key = *long_keyp;
                array_append(&exp, &entry, 1);
        }