From 8625e321e61c77ba2d6740e3ac5d2804ce969657 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 17 Jan 2017 00:14:44 +0300 Subject: [PATCH] Fix lack of 2 trailing zeros in _MSC_VER numbers _MSC_VER value consists of 4 digits (as of VS 2015). * include/gc_config_macros.h [!GC_ATTR_MALLOC && !__GNUC__ && _MSC_VER] (GC_ATTR_MALLOC): Replace _MSC_VER>=14 with _MSC_VER>=1400. * include/private/gc_priv.h [!__GNUC__ && _MSC_VER] (GC_ATTR_NOINLINE): Likewise. * include/gc_config_macros.h [!GC_BUILD && !__GNUC__ && _MSC_VER] (GC_ATTR_DEPRECATED): Replace _MSC_VER>=12 with _MSC_VER>=1200. --- include/gc_config_macros.h | 4 ++-- include/private/gc_priv.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/gc_config_macros.h b/include/gc_config_macros.h index 0e77ceb..e8748f5 100644 --- a/include/gc_config_macros.h +++ b/include/gc_config_macros.h @@ -233,7 +233,7 @@ # elif defined(__GNUC__) && (__GNUC__ > 3 \ || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) # define GC_ATTR_MALLOC __attribute__((__malloc__)) -# elif defined(_MSC_VER) && _MSC_VER >= 14 +# elif defined(_MSC_VER) && _MSC_VER >= 1400 # define GC_ATTR_MALLOC __declspec(noalias) __declspec(restrict) # else # define GC_ATTR_MALLOC @@ -271,7 +271,7 @@ # define GC_ATTR_DEPRECATED /* empty */ # elif defined(__GNUC__) && __GNUC__ >= 4 # define GC_ATTR_DEPRECATED __attribute__((__deprecated__)) -# elif defined(_MSC_VER) && _MSC_VER >= 12 +# elif defined(_MSC_VER) && _MSC_VER >= 1200 # define GC_ATTR_DEPRECATED __declspec(deprecated) # else # define GC_ATTR_DEPRECATED /* empty */ diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h index 417092d..4142537 100644 --- a/include/private/gc_priv.h +++ b/include/private/gc_priv.h @@ -195,7 +195,7 @@ typedef char * ptr_t; /* A generic pointer to which we can add */ #ifndef GC_ATTR_NOINLINE # if __GNUC__ >= 4 # define GC_ATTR_NOINLINE __attribute__((__noinline__)) -# elif _MSC_VER >= 14 +# elif _MSC_VER >= 1400 # define GC_ATTR_NOINLINE __declspec(noinline) # else # define GC_ATTR_NOINLINE /* empty */ -- 2.7.4