From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 14 Sep 2021 16:23:41 +0000 (+0200)
Subject: lib: DOVECOT_PREREQ() - Remove surrounding if checks
X-Git-Tag: 2.3.18~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb5968f451877e9c0ea37b91b100efc0be1be2fc;p=thirdparty%2Fdovecot%2Fcore.git

lib: DOVECOT_PREREQ() - Remove surrounding if checks

The DOVECOT_VERSION_* macros are expected to always exist.
---

diff --git a/src/lib/macros.h b/src/lib/macros.h
index bfe32e4b47..dea1ac7270 100644
--- a/src/lib/macros.h
+++ b/src/lib/macros.h
@@ -233,13 +233,9 @@
 		#expr);			}STMT_END
 #endif
 
-/* Convenience macros to test the versions of dovecot. */
-#if defined DOVECOT_VERSION_MAJOR && defined DOVECOT_VERSION_MINOR
-#  define DOVECOT_PREREQ(maj, min) \
-          ((DOVECOT_VERSION_MAJOR << 16) + DOVECOT_VERSION_MINOR >= ((maj) << 16) + (min))
-#else
-#  define DOVECOT_PREREQ(maj, min) 0
-#endif
+/* Convenience macro to test the versions of dovecot. */
+#define DOVECOT_PREREQ(maj, min) \
+	((DOVECOT_VERSION_MAJOR << 16) + DOVECOT_VERSION_MINOR >= ((maj) << 16) + (min))
 
 #ifdef __cplusplus
 #  undef STATIC_ARRAY