From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 10 Feb 2021 17:49:00 +0000 (+0200)
Subject: lib: array.h - Require C99
X-Git-Tag: 2.3.16~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=178a24d520d60f0a49992f06efadd660139eaab8;p=thirdparty%2Fdovecot%2Fcore.git

lib: array.h - Require C99

We're already requiring C99 elsewhere.
---

diff --git a/src/lib/array.h b/src/lib/array.h
index 927b0777dd..e04124012b 100644
--- a/src/lib/array.h
+++ b/src/lib/array.h
@@ -67,12 +67,11 @@
 #endif
 
 /* usage: struct foo *foo; array_foreach(foo_arr, foo) { .. } */
-#if (defined(__STDC__) && __STDC_VERSION__ >= 199901L)
-#  define array_foreach(array, elem) \
+#define array_foreach(array, elem) \
 	for (const void *elem ## __foreach_end = \
 		(const char *)(elem = *(array)->v) + (array)->arr.buffer->used; \
 	     elem != elem ## __foreach_end; (elem)++)
-#  define array_foreach_modifiable(array, elem) \
+#define array_foreach_modifiable(array, elem) \
 	for (const void *elem ## _end = \
 		(const char *)(elem = ARRAY_TYPE_CAST_MODIFIABLE(array) \
 			buffer_get_modifiable_data((array)->arr.buffer, NULL)) + \
@@ -83,7 +82,7 @@
    array_foreach_elem(array, &myvar) { ... use myvar ... } // clearer, as more pass-by-referencey
    Latter is impossible if we want to use the variable name as the base for the other variable names
 */
-#  define array_foreach_elem(array, elem) \
+#define array_foreach_elem(array, elem) \
 	for (const void *_foreach_end = \
 		CONST_PTR_OFFSET(*(array)->v, (array)->arr.buffer->used), \
 	     *_foreach_ptr = CONST_PTR_OFFSET(*(array)->v, ARRAY_TYPE_CHECK(array, &elem) + \
@@ -94,17 +93,6 @@
 		;							\
 	     _foreach_ptr = CONST_PTR_OFFSET(_foreach_ptr, sizeof(elem)))
 
-#else
-#  define array_foreach(array, elem) \
-	for (elem = *(array)->v; \
-	     elem != CONST_PTR_OFFSET(*(array)->v, (array)->arr.buffer->used); \
-	     (elem)++)
-#  define array_foreach_modifiable(array, elem) \
-	for (elem = ARRAY_TYPE_CAST_MODIFIABLE(array) \
-			buffer_get_modifiable_data((array)->arr.buffer, NULL); \
-	     elem != CONST_PTR_OFFSET(*(array)->v, (array)->arr.buffer->used); \
-	     (elem)++)
-#endif
 
 #define array_ptr_to_idx(array, elem) \
 	((elem) - (array)->v[0])