Skip to content

add defined() for WIN32 and _MSC_VER #13

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

Merged
merged 1 commit into from
Aug 28, 2015
Merged

add defined() for WIN32 and _MSC_VER #13

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/mpack/mpack-platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void mpack_assert_fail(const char* message) {

#if defined(__GCC__) || defined(__clang__)
__builtin_trap();
#elif WIN32
#elif defined(WIN32)
__debugbreak();
#endif

Expand All @@ -89,7 +89,7 @@ void mpack_break_hit(const char* message) {

#if defined(__GCC__) || defined(__clang__)
__builtin_trap();
#elif WIN32
#elif defined(WIN32)
__debugbreak();
#elif MPACK_STDLIB
abort();
Expand Down
2 changes: 1 addition & 1 deletion src/mpack/mpack-platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ extern "C" {
#define MPACK_UNREACHABLE __builtin_unreachable()
#define MPACK_NORETURN(fn) fn __attribute__((noreturn))
#define MPACK_ALWAYS_INLINE __attribute__((always_inline)) static inline
#elif _MSC_VER
#elif defined(_MSC_VER)
#define MPACK_UNREACHABLE __assume(0)
#define MPACK_NORETURN(fn) __declspec(noreturn) fn
#define MPACK_ALWAYS_INLINE __forceinline static
Expand Down