[Mesa-dev] [PATCH] Require Visual Studio 2015.
Roland Scheidegger
sroland at vmware.com
Fri Sep 7 18:29:54 UTC 2018
Looks good to me.
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Am 07.09.2018 um 17:59 schrieb Jose Fonseca:
> We no longer need or use Visual Studio 2013.
>
> https://ci.appveyor.com/project/jrfonseca/mesa/build/52
> ---
> docs/install.html | 2 +-
> include/c11/threads_win32.h | 12 +-----------
> include/c99_compat.h | 4 ++--
> src/util/macros.h | 4 +---
> 4 files changed, 5 insertions(+), 17 deletions(-)
>
> diff --git a/docs/install.html b/docs/install.html
> index d3c53d174a3..49a88067501 100644
> --- a/docs/install.html
> +++ b/docs/install.html
> @@ -57,7 +57,7 @@ willing to maintain support for other compiler get in touch.
> <ul>
> <li>GCC 4.2.0 or later (some parts of Mesa may require later versions)
> <li>clang - exact minimum requirement is currently unknown.
> -<li>Microsoft Visual Studio 2013 Update 4 or later is required, for building on Windows.
> +<li>Microsoft Visual Studio 2015 or later is required, for building on Windows.
> </ul>
>
>
> diff --git a/include/c11/threads_win32.h b/include/c11/threads_win32.h
> index dac8ef76973..326cfc46775 100644
> --- a/include/c11/threads_win32.h
> +++ b/include/c11/threads_win32.h
> @@ -76,18 +76,8 @@ Configuration macro:
> #endif
>
> /* Visual Studio 2015 and later */
> -#if _MSC_VER >= 1900
> -#define HAVE_TIMESPEC
> +#ifdef _MSC_VER
> #define HAVE_TIMESPEC_GET
> -#elif defined(__MINGW32__)
> -#define HAVE_TIMESPEC
> -#endif
> -
> -#ifndef HAVE_TIMESPEC
> -struct timespec {
> - time_t tv_sec;
> - long tv_nsec;
> -};
> #endif
>
> /*---------------------------- macros ----------------------------*/
> diff --git a/include/c99_compat.h b/include/c99_compat.h
> index 81621a7fabc..b681725b2b0 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
>
> /*
> diff --git a/src/util/macros.h b/src/util/macros.h
> index fb522ee3d3e..c47bbb6dfcd 100644
> --- a/src/util/macros.h
> +++ b/src/util/macros.h
> @@ -198,9 +198,7 @@ do { \
> # define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
> # endif
> # elif defined(_MSC_VER) && !defined(__INTEL_COMPILER)
> -# if _MSC_VER >= 1800
> -# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
> -# endif
> +# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
> # endif
> # ifndef HAS_TRIVIAL_DESTRUCTOR
> /* It's always safe (if inefficient) to assume that a
>
More information about the mesa-dev
mailing list