From 8d892dc05668ca86d7ce90461bfe57622224dd14 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 6 Apr 2013 10:36:24 +0000 Subject: [PATCH] [PSDK] * Add DEFAULT_UNREACHABLE macro to ntdef.h. * Add break to the last case. svn path=/trunk/; revision=58686 --- reactos/include/psdk/ntdef.h | 9 +++++++++ reactos/include/psdk/winnt.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/reactos/include/psdk/ntdef.h b/reactos/include/psdk/ntdef.h index a0aaf31d546..770a23eb699 100644 --- a/reactos/include/psdk/ntdef.h +++ b/reactos/include/psdk/ntdef.h @@ -700,6 +700,15 @@ typedef struct _GROUP_AFFINITY { /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] +/* Eliminate Microsoft C/C++ compiler warning 4715 */ +#if defined(_MSC_VER) && (_MSC_VER > 1200) +# define DEFAULT_UNREACHABLE default: __assume(0) +#elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define DEFAULT_UNREACHABLE default: __builtin_unreachable() +#else +# define DEFAULT_UNREACHABLE default: break +#endif + #define VER_WORKSTATION_NT 0x40000000 #define VER_SERVER_NT 0x80000000 #define VER_SUITE_SMALLBUSINESS 0x00000001 diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index 57b7ea495b9..38ceab02136 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -422,7 +422,7 @@ typedef DWORD FLONG; #elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) # define DEFAULT_UNREACHABLE default: __builtin_unreachable() #else -# define DEFAULT_UNREACHABLE default: +# define DEFAULT_UNREACHABLE default: break #endif #include "intrin.h"