Mesa (master): util: rework _MSC_VER >= 1200 checks

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 3f167516399c8e20478bb0081a24ab7ac155b093
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f167516399c8e20478bb0081a24ab7ac155b093

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Mar  5 23:40:10 2015 +0000

util: rework _MSC_VER >= 1200 checks

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 at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/util/macros.h |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/util/macros.h b/src/util/macros.h
index b862bfd..63daba3 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -73,15 +73,13 @@ do {                        \
    assert(!str);            \
    __builtin_unreachable(); \
 } while (0)
-#elif _MSC_VER >= 1200
+#elif defined (_MSC_VER)
 #define unreachable(str)    \
 do {                        \
    assert(!str);            \
    __assume(0);             \
 } while (0)
-#endif
-
-#ifndef unreachable
+#else
 #define unreachable(str) assert(!str)
 #endif
 
@@ -99,7 +97,7 @@ do {                       \
 #define assume(expr) ((expr) ? ((void) 0) \
                              : (assert(!"assumption failed"), \
                                 __builtin_unreachable()))
-#elif _MSC_VER >= 1200
+#elif defined (_MSC_VER)
 #define assume(expr) __assume(expr)
 #else
 #define assume(expr) assert(expr)