Skip to content

compilersupport: fix compilation in C23 mode #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thiagomacieira wants to merge 1 commit into
base: main
Choose a base branch
from
Open

compilersupport: fix compilation in C23 mode #309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/compilersupport_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,10 @@
# define cbor_static_assert(x) ((void)sizeof(char[2*!!(x) - 1]))
#endif

#if defined(__has_cpp_attribute) && defined(__cplusplus) // C++17
#if defined(__has_cpp_attribute) // C23 and C++17
# if __has_cpp_attribute(fallthrough)
# define CBOR_FALLTHROUGH [[fallthrough]]
# endif
#elif defined(__has_c_attribute) && !defined(__cplusplus) // C23
# if __has_c_attribute(fallthrough)
# define CBOR_FALLTHROUGH [[fallthrough]]
# endif
#endif
#ifndef CBOR_FALLTHROUGH
# ifdef __GNUC__
Expand Down Expand Up @@ -209,22 +205,22 @@
# define CBOR_NULLPTR NULL
#endif

#ifdef __GNUC__
#ifndef likely
#ifdef likely
/* something has already defined likely(), accept it */
#elif defined(__GNUC__)
# define likely(x) __builtin_expect(!!(x), 1)
#endif
#ifndef unlikely
# define unlikely(x) __builtin_expect(!!(x), 0)
#else
# define likely(x) (x)
# define unlikely(x) (x)
#endif

#ifdef unreachable
/* C23 has unreachable() */
#elif defined(__GNUC__)
# define unreachable() __builtin_unreachable()
#elif defined(_MSC_VER)
# define likely(x) (x)
# define unlikely(x) (x)
# define unreachable() __assume(0)
#else
# define likely(x) (x)
# define unlikely(x) (x)
# define unreachable() do {} while (0)
#endif

static inline bool add_check_overflow(size_t v1, size_t v2, size_t *r)
Expand Down
Loading