aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2013-08-15 10:38:05 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-08-15 15:48:26 +0200
commitc4cc924074bff7e560380851d92782b255083075 (patch)
tree5bbef316a122d384c1dfbc96224c5cb9610e1c05
parentbf991bc0f3006eddf45d494ee7e476a75dbaf36e (diff)
core: Remove defined() check for OSMO_DEPRECATE
This reverts commit bf991bc0f3006eddf45d494ee7e476a75dbaf36e and fixes the bug instead. It's just sufficient to remove the defined() test, since identifiers that aren't macros are just considered as 0 when used with #if. (see cpp info page, section 4.2.2 'If' in cpp-4.6.info)
-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 ca12a80..5ffee04 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)