diff options
| -rw-r--r-- | include/c99/stdbool.h | 3 | ||||
| -rw-r--r-- | include/c99_compat.h | 6 | ||||
| -rw-r--r-- | src/glx/dri_common.h | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/include/c99/stdbool.h b/include/c99/stdbool.h index 99af1a021bf..856be5fb0f6 100644 --- a/include/c99/stdbool.h +++ b/include/c99/stdbool.h @@ -35,8 +35,7 @@ #define bool _Bool /* For compilers that don't have the builtin _Bool type. */ -#if (defined(_MSC_VER) && _MSC_VER < 1800) || \ - (defined __GNUC__&& __STDC_VERSION__ < 199901L && __GNUC__ < 3) +#if (defined(_MSC_VER) && _MSC_VER < 1800) typedef unsigned char _Bool; #endif diff --git a/include/c99_compat.h b/include/c99_compat.h index 429c6014845..e5d0ae43a50 100644 --- a/include/c99_compat.h +++ b/include/c99_compat.h @@ -114,11 +114,7 @@ # elif defined(__SUNPRO_C) && defined(__C99FEATURES__) /* C99 */ # elif defined(__GNUC__) -# if __GNUC__ >= 2 -# define __func__ __FUNCTION__ -# else -# define __func__ "<unknown>" -# endif +# define __func__ __FUNCTION__ # elif defined(_MSC_VER) # if _MSC_VER >= 1300 # define __func__ __FUNCTION__ diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h index 6234fd812bf..5cd150ab4d2 100644 --- a/src/glx/dri_common.h +++ b/src/glx/dri_common.h @@ -40,7 +40,7 @@ #include <stdbool.h> #include "loader.h" -#if (__GNUC__ >= 3) +#if (__GNUC__) #define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a))) #else #define PRINTFLIKE(f, a) |