From 328375d2742a3394dc481fc5fae6c4a5d797b4e7 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Thu, 2 Apr 2015 17:35:16 +0200 Subject: [PATCH] gallium: fix gcc compile errors when using _XOPEN_SOURCE=600 but not std=c99 The fpclassify stuff either needs std=c99 or _XOPEN_SOURCE=600 passed to gcc, but when using the latter the lrint family of function will be defined too. --- include/c99_math.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/c99_math.h b/include/c99_math.h index ee0dd105e49..7ed7cc22176 100644 --- a/include/c99_math.h +++ b/include/c99_math.h @@ -83,7 +83,11 @@ roundf(float x) #if (defined(_MSC_VER) && _MSC_VER < 1800) || \ - (!defined(_MSC_VER) && __STDC_VERSION__ < 199901L && !defined(__cplusplus)) + (!defined(_MSC_VER) && \ + __STDC_VERSION__ < 199901L && \ + (!defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600) && \ + !defined(__cplusplus)) + static inline long int lrint(double d) { @@ -135,6 +139,7 @@ llrintf(float f) return rounded; } + #endif /* C99 */