From b15038a28991c73b4bd26c30cf1f0aba20d42d53 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 20 Mar 2017 16:03:07 -0700 Subject: [PATCH] i965: Shut up major()/minor() warnings. Recent glibc generates this warning: brw_performance_query.c:1648:13: warning: In the GNU C Library, "minor" is defined by . For historical compatibility, it is currently defined by as well, but we plan to remove this soon. To use "minor", include directly. If you did not intend to use a system-defined macro "minor", you should undefine it after including . min = minor(sb.st_rdev); So, include sys/sysmacros.h to shut up the warning. v2: Use the AC_HEADER_MAJOR defines to figure out the right header (thanks to Jonathan Gray for helping me not break non-glibc systems) Reviewed-by: Matt Turner [v1] Reviewed-by: Emil Velikov --- src/mesa/drivers/dri/i965/brw_performance_query.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index 2e04e091d29..4a94e4b3cc2 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -42,6 +42,13 @@ #include #include +/* put before sys/types.h to silence glibc warnings */ +#ifdef MAJOR_IN_MKDEV +#include +#endif +#ifdef MAJOR_IN_SYSMACROS +#include +#endif #include #include #include -- 2.30.2