From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 21 Dec 2016 17:50:10 +0000 (+0200)
Subject: Fix compiling when compiler doesn't support typeof()
X-Git-Tag: 2.3.0.rc1~2388
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00a15fe7ccadda399a86fe67ad2ed22488ff0c05;p=thirdparty%2Fdovecot%2Fcore.git

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 a5c2694aa8..bb77879413 100644
--- 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 e9d0eb073c..0fd9fd8783 100644
--- 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);
 	}