aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/osmocom/core/defs.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/include/osmocom/core/defs.h b/include/osmocom/core/defs.h
index ca12a80f..5ffee046 100644
--- a/include/osmocom/core/defs.h
+++ b/include/osmocom/core/defs.h
@@ -27,22 +27,16 @@
/*! \brief Set the deprecated attribute with a message.
*/
#if defined(__clang__)
-# if __has_attribute(deprecated)
-# define _OSMO_HAS_ATTRIBUTE_DEPRECATED 1
-# endif
-# if __has_extension(attribute_deprecated_with_message)
-# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE 1
-# endif
+# define _OSMO_HAS_ATTRIBUTE_DEPRECATED __has_attribute(deprecated)
+# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE __has_extension(attribute_deprecated_with_message)
#elif defined(__GNUC__)
# define _OSMO_HAS_ATTRIBUTE_DEPRECATED 1
-# if OSMO_GNUC_PREREQ(4,5)
-# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE 1
-# endif
+# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE OSMO_GNUC_PREREQ(4,5)
#endif
-#if defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE)
+#if _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE
# define OSMO_DEPRECATED(text) __attribute__((__deprecated__(text)))
-#elif defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED)
+#elif _OSMO_HAS_ATTRIBUTE_DEPRECATED
# define OSMO_DEPRECATED(text) __attribute__((__deprecated__))
#else
# define OSMO_DEPRECATED(text)