projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/gen8: Don't add workaround bits to PIPE_CONTROL stalls if DC flush is set.
[mesa.git]
/
include
/
c99_compat.h
diff --git
a/include/c99_compat.h
b/include/c99_compat.h
index 3a9f502a7ea5edc6191392b0415dd8496053efca..4be5b7e1259a1f5e2f52209e4c74860e7feffe73 100644
(file)
--- a/
include/c99_compat.h
+++ b/
include/c99_compat.h
@@
-25,6
+25,8
@@
*
**************************************************************************/
*
**************************************************************************/
+#include "no_extern_c.h"
+
#ifndef _C99_COMPAT_H_
#define _C99_COMPAT_H_
#ifndef _C99_COMPAT_H_
#define _C99_COMPAT_H_
@@
-33,16
+35,19
@@
* MSVC hacks.
*/
#if defined(_MSC_VER)
* MSVC hacks.
*/
#if defined(_MSC_VER)
+
+# if _MSC_VER < 1500
+# error "Microsoft Visual Studio 2008 or higher required"
+# endif
+
/*
* Visual Studio 2012 will complain if we define the `inline` keyword, but
* actually it only supports the keyword on C++.
*
/*
* Visual Studio 2012 will complain if we define the `inline` keyword, but
* actually it only supports the keyword on C++.
*
- * We could skip this check by defining _ALLOW_KEYWORD_MACROS, but there is
- * probably value in checking this for other keywords. So simply include
- * the checking before we define it below.
+ * To avoid this the _ALLOW_KEYWORD_MACROS must be set.
*/
*/
-# if
_MSC_VER >= 1700
-#
include <xkeycheck.h>
+# if
(_MSC_VER >= 1700) && !defined(_ALLOW_KEYWORD_MACROS)
+#
define _ALLOW_KEYWORD_MACROS
# endif
/*
# endif
/*
@@
-76,8
+81,6
@@
/* Intel compiler supports inline keyword */
# elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
# define inline __inline
/* Intel compiler supports inline keyword */
# elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
# define inline __inline
-# elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
- /* C99 supports inline keyword */
# elif (__STDC_VERSION__ >= 199901L)
/* C99 supports inline keyword */
# else
# elif (__STDC_VERSION__ >= 199901L)
/* C99 supports inline keyword */
# else
@@
-95,8
+98,6
@@
#ifndef restrict
# if (__STDC_VERSION__ >= 199901L)
/* C99 */
#ifndef restrict
# if (__STDC_VERSION__ >= 199901L)
/* C99 */
-# elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
- /* C99 */
# elif defined(__GNUC__)
# define restrict __restrict__
# elif defined(_MSC_VER)
# elif defined(__GNUC__)
# define restrict __restrict__
# elif defined(_MSC_VER)
@@
-113,20
+114,10
@@
#ifndef __func__
# if (__STDC_VERSION__ >= 199901L)
/* C99 */
#ifndef __func__
# if (__STDC_VERSION__ >= 199901L)
/* C99 */
-# elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
- /* C99 */
# elif defined(__GNUC__)
# elif defined(__GNUC__)
-# if __GNUC__ >= 2
-# define __func__ __FUNCTION__
-# else
-# define __func__ "<unknown>"
-# endif
+# define __func__ __FUNCTION__
# elif defined(_MSC_VER)
# elif defined(_MSC_VER)
-# if _MSC_VER >= 1300
-# define __func__ __FUNCTION__
-# else
-# define __func__ "<unknown>"
-# endif
+# define __func__ __FUNCTION__
# else
# define __func__ "<unknown>"
# endif
# else
# define __func__ "<unknown>"
# endif