OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: rework _MSC_VER >= 1200 checks

Browse Source 
Replace the _MSC_VER >= 1200 with defined (_MSC_VER) and compact if/else
statements. We require MSVC 2008 or later with commit 46110c5d564.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Emil Velikov
2015-03-05 23:40:10 +00:00
parent 38591295cd
commit 3f16751639
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/macros.h
View File

@@ -73,15 +73,13 @@ do { \
assert(!str); \ assert(!str); \
__builtin_unreachable(); \ __builtin_unreachable(); \
} while (0) } while (0)
#elif _MSC_VER >= 1200 #elif defined (_MSC_VER)
#define unreachable(str) \ #define unreachable(str) \
do { \ do { \
assert(!str); \ assert(!str); \
__assume(0); \ __assume(0); \
} while (0) } while (0)
#endif #else
#ifndef unreachable
#define unreachable(str) assert(!str) #define unreachable(str) assert(!str)
#endif #endif
@@ -99,7 +97,7 @@ do { \
#define assume(expr) ((expr) ? ((void) 0) \ #define assume(expr) ((expr) ? ((void) 0) \
: (assert(!"assumption failed"), \ : (assert(!"assumption failed"), \
__builtin_unreachable())) __builtin_unreachable()))
#elif _MSC_VER >= 1200 #elif defined (_MSC_VER)
#define assume(expr) __assume(expr) #define assume(expr) __assume(expr)
#else #else
#define assume(expr) assert(expr) #define assume(expr) assert(expr)