X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=include%2Fc99_compat.h;h=729b5b798688c1841625d0ff313a9b3efe03529b;hb=8ff8e68e422a5c6b9ab26eaa56eff5c27a642d2e;hp=24e96e0efefd2c5b6b041f5f40fabf0b87df891d;hpb=805dbdf06d98e6dcfe0b24e38cc13c88eb5f36be;p=mesa.git

diff --git a/include/c99_compat.h b/include/c99_compat.h
index 24e96e0efef..729b5b79868 100644
--- a/include/c99_compat.h
+++ b/include/c99_compat.h
@@ -36,8 +36,8 @@
  */
 #if defined(_MSC_VER)
 
-#  if _MSC_VER < 1800 || (_MSC_FULL_VER < 180031101 && !defined(__clang__))
-#    error "Microsoft Visual Studio 2013 Update 4 or higher required"
+#  if _MSC_VER < 1900
+#    error "Microsoft Visual Studio 2015 or higher required"
 #  endif
 
    /*
@@ -96,7 +96,7 @@
  * - http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html
  */
 #ifndef restrict
-#  if (__STDC_VERSION__ >= 199901L)
+#  if (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
      /* C99 */
 #  elif defined(__GNUC__)
 #    define restrict __restrict__
@@ -135,9 +135,8 @@ test_c99_compat_h(const void * restrict a,
 #endif
 
 
-/* Fallback definitions, for build systems other than autoconfig which don't
- * auto-detect these things. */
-#ifdef HAVE_NO_AUTOCONF
+/* Fallback definitions, for scons which doesn't auto-detect these things. */
+#ifdef HAVE_SCONS
 
 #  ifndef _WIN32
 #    define HAVE_PTHREAD
@@ -163,6 +162,8 @@ test_c99_compat_h(const void * restrict a,
 #    define HAVE_FUNC_ATTRIBUTE_UNUSED 1
 #    define HAVE_FUNC_ATTRIBUTE_FORMAT 1
 #    define HAVE_FUNC_ATTRIBUTE_PACKED 1
+#    define HAVE_FUNC_ATTRIBUTE_ALIAS 1
+#    define HAVE_FUNC_ATTRIBUTE_NORETURN 1
 
 #    if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
        /* https://gcc.gnu.org/onlinedocs/gcc-4.3.6/gcc/Other-Builtins.html */
@@ -176,7 +177,7 @@ test_c99_compat_h(const void * restrict a,
 
 #  endif /* __GNUC__ */
 
-#endif /* !HAVE_AUTOCONF */
+#endif /* HAVE_SCONS */
 
 
 #endif /* _C99_COMPAT_H_ */