From 1b649fb58240c025871197df3330c37ba7b13c0d Mon Sep 17 00:00:00 2001 From: rexy712 Date: Tue, 7 Apr 2020 13:07:14 -0700 Subject: [PATCH] Cleanup macro checks in rjp.h --- include/rjp.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/include/rjp.h b/include/rjp.h index 1f53d33..08c3b85 100644 --- a/include/rjp.h +++ b/include/rjp.h @@ -22,26 +22,23 @@ #ifdef __cplusplus extern "C"{ #endif -#ifndef __STDC_VERSION__ -# ifdef __cplusplus -# if __cplusplus >= 201402L -# define DEPRECATED(str) [[deprecated(str)]] -# elif defined(__GNUC__) || defined(__clang__) -# define DEPRECATED(str) __attribute__((deprecated(str))) -# else -# define DEPRECATED(str) -# endif -# else -# define DEPRECATED(str) -# endif -#else -# if __STDC_VERSION__ > 201710L + +#ifdef __cplusplus +# if __cplusplus >= 201402L # define DEPRECATED(str) [[deprecated(str)]] # elif defined(__GNUC__) || defined(__clang__) # define DEPRECATED(str) __attribute__((deprecated(str))) +# elif __cplusplus >= 201103L +# define DEPRECATED(str) [[deprecated]] # else # define DEPRECATED(str) # endif +#elif __STDC_VERSION__ > 201710L +# define DEPRECATED(str) [[deprecated(str)]] +#elif defined(__GNUC__) || defined(__clang__) +# define DEPRECATED(str) __attribute__((deprecated(str))) +#else +# define DEPRECATED(str) #endif #ifndef RJP_int