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.

diff --git a/include/gc_config_macros.h b/include/gc_config_macros.h
index adcca45dda7b8115b13dc0ec308c861ff5ef5ec3..a776a1b97b306e2db31667080a5e7e800575cc9e 100644 (file)
--- 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 3c6f04334472ab74eccfb3168b30a2338e58076f..5bc7146cd604700766086e522cdea68e0bb7f731 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -174,7 +174,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 */