diff options
| author | Matt Turner <[email protected]> | 2016-07-21 11:46:23 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2016-07-26 12:12:41 -0700 |
| commit | 20553e4a2d952f6dc37f40f63d2c86b0718c58f9 (patch) | |
| tree | 3c615a5ff9e9237920bedd873794fbb4ce539e8f | |
| parent | 815135166c9891de4042990a05d0ef24bb90e409 (diff) | |
mesa: Use AC_HEADER_MAJOR to include correct header for major().
Gentoo has been smoke testing an upcoming change to glibc.
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=580392
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/vmw_screen.c | 7 | ||||
| -rw-r--r-- | src/gbm/main/gbm.c | 7 | ||||
| -rw-r--r-- | src/loader/loader.c | 7 |
4 files changed, 18 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5c196a93196..f6b27ae086a 100644 --- a/configure.ac +++ b/configure.ac @@ -777,6 +777,7 @@ if test "x$enable_asm" = xyes; then esac fi +AC_HEADER_MAJOR AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"]) AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) diff --git a/src/gallium/winsys/svga/drm/vmw_screen.c b/src/gallium/winsys/svga/drm/vmw_screen.c index 7fcb6d27714..74c77c54e84 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen.c +++ b/src/gallium/winsys/svga/drm/vmw_screen.c @@ -31,7 +31,12 @@ #include "util/u_memory.h" #include "pipe/p_compiler.h" #include "util/u_hash_table.h" -#include <sys/types.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#endif +#ifdef MAJOR_IN_SYSMACROS +#include <sys/sysmacros.h> +#endif #include <sys/stat.h> #include <unistd.h> diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c index 5a6e758e7a5..20ff3f280a7 100644 --- a/src/gbm/main/gbm.c +++ b/src/gbm/main/gbm.c @@ -31,7 +31,12 @@ #include <string.h> #include <stdint.h> -#include <sys/types.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#endif +#ifdef MAJOR_IN_SYSMACROS +#include <sys/sysmacros.h> +#endif #include <sys/stat.h> #include <unistd.h> #include <errno.h> diff --git a/src/loader/loader.c b/src/loader/loader.c index 522fba354c9..56ffc5d77a7 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -80,8 +80,11 @@ #include "xmlpool.h" #endif #endif -#ifdef HAVE_SYSFS -#include <sys/types.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#endif +#ifdef MAJOR_IN_SYSMACROS +#include <sys/sysmacros.h> #endif #include "loader.h" |