diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:40:05 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:40:05 +0000 |
| commit | 21ab4c9f31674b113c24177398ed39f29b7cd8e6 (patch) | |
| tree | 8be392d7a792d9663c2586396be77bfd506f5164 /lib/mesa/include/c99_compat.h | |
| parent | a8f0a7916e26e550dd2a26e7188835c481978004 (diff) | |
Import Mesa 13.0.2
Diffstat (limited to 'lib/mesa/include/c99_compat.h')
| -rw-r--r-- | lib/mesa/include/c99_compat.h | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/lib/mesa/include/c99_compat.h b/lib/mesa/include/c99_compat.h index b55ad9c18..24e96e0ef 100644 --- a/lib/mesa/include/c99_compat.h +++ b/lib/mesa/include/c99_compat.h @@ -36,8 +36,8 @@ */ #if defined(_MSC_VER) -# if _MSC_VER < 1800 -# error "Microsoft Visual Studio 2013 or higher required" +# if _MSC_VER < 1800 || (_MSC_FULL_VER < 180031101 && !defined(__clang__)) +# error "Microsoft Visual Studio 2013 Update 4 or higher required" # endif /* @@ -135,4 +135,48 @@ 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 + +# ifndef _WIN32 +# define HAVE_PTHREAD +# define HAVE_POSIX_MEMALIGN +# endif + +# ifdef __GNUC__ +# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) +# error "GCC version 4.2 or higher required" +# endif + + /* https://gcc.gnu.org/onlinedocs/gcc-4.2.4/gcc/Other-Builtins.html */ +# define HAVE___BUILTIN_CLZ 1 +# define HAVE___BUILTIN_CLZLL 1 +# define HAVE___BUILTIN_CTZ 1 +# define HAVE___BUILTIN_EXPECT 1 +# define HAVE___BUILTIN_FFS 1 +# define HAVE___BUILTIN_FFSLL 1 +# define HAVE___BUILTIN_POPCOUNT 1 +# define HAVE___BUILTIN_POPCOUNTLL 1 + /* https://gcc.gnu.org/onlinedocs/gcc-4.2.4/gcc/Function-Attributes.html */ +# define HAVE_FUNC_ATTRIBUTE_FLATTEN 1 +# define HAVE_FUNC_ATTRIBUTE_UNUSED 1 +# define HAVE_FUNC_ATTRIBUTE_FORMAT 1 +# define HAVE_FUNC_ATTRIBUTE_PACKED 1 + +# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) + /* https://gcc.gnu.org/onlinedocs/gcc-4.3.6/gcc/Other-Builtins.html */ +# define HAVE___BUILTIN_BSWAP32 1 +# define HAVE___BUILTIN_BSWAP64 1 +# endif + +# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) +# define HAVE___BUILTIN_UNREACHABLE 1 +# endif + +# endif /* __GNUC__ */ + +#endif /* !HAVE_AUTOCONF */ + + #endif /* _C99_COMPAT_H_ */ |