Separate feature checking from implementation. Supported are clang and gcc. --- include/osmocom/core/defs.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/include/osmocom/core/defs.h b/include/osmocom/core/defs.h index e3afbff..917a8c3 100644 --- a/include/osmocom/core/defs.h +++ b/include/osmocom/core/defs.h @@ -26,14 +26,25 @@
/*! \brief Set the deprecated attribute with a message. */ -#if ! defined(__GNUC__) -# define OSMO_DEPRECATED(text) -#elif OSMO_GNUC_PREREQ(4,5) +#if defined(__clang__) +# 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 +# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE OSMO_GNUC_PREREQ(4,5) +#endif + +#if defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE) # define OSMO_DEPRECATED(text) __attribute__((__deprecated__(text))) -#else +#elif defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED) # define OSMO_DEPRECATED(text) __attribute__((__deprecated__)) +#else +# define OSMO_DEPRECATED(text) #endif
+#undef _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE +#undef _OSMO_HAS_ATTRIBUTE_DEPRECATED + /*! @} */
#endif
Fix type of argument 'argv'.
Addresses: conv/conv_test.c:358:5: error: second parameter of 'main' (argument array) must be of type 'char **' int main(int argc, char argv[]) --- tests/conv/conv_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/conv/conv_test.c b/tests/conv/conv_test.c index 54e043e..ab651d4 100644 --- a/tests/conv/conv_test.c +++ b/tests/conv/conv_test.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h>
#include <osmocom/core/bits.h> @@ -355,7 +356,7 @@ sbit_to_ubit(ubit_t *dst, sbit_t *src, int n) }
-int main(int argc, char argv[]) +int main(int argc, char *argv[]) { const struct conv_test_vector *tst; ubit_t *bu0, *bu1;
On Wed, Aug 14, 2013 at 06:13:45PM +0200, Jacob Erlbeck wrote:
Separate feature checking from implementation. Supported are clang and +# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE OSMO_GNUC_PREREQ(4,5)
+#if defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE)
we both got it wrong. it needs to be #if _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE > 0 because we unconditionally define these two for gcc and clang. :}
On 08/14/2013 08:24 PM, Holger Hans Peter Freyther wrote:
On Wed, Aug 14, 2013 at 06:13:45PM +0200, Jacob Erlbeck wrote:
+#if defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE)
we both got it wrong. it needs to be #if _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE > 0 because we unconditionally define these two for gcc and clang. :}
No, it's just '#if _OSMO_HAS_FOO' since non-macro identifiers are considered 0 (according to 'info cpp'). I've verified this with gcc and clang. And I've installed gcc-4.4 to check stuff like this before jenkins does.
Jacob
-
Holger Hans Peter Freyther -
Jacob Erlbeck