Attachment 124643 Details for Bug 94231 – using AC_CHECK_HEADERS

[patch] using AC_CHECK_HEADERS

libdrm-MAJOR_IN_SYSMACROS.patch (text/plain), 1.80 KB, created by Mike Frysinger on 2016-06-21 18:13:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Frysinger

Created: 2016-06-21 18:13:27 UTC

Size: 1.80 KB

patch

obsolete

>From 127bc60e16868b098e538f0dd85c8d47b849f550 Mon Sep 17 00:00:00 2001
>From: Mike Frysinger <vapier@gentoo.org>
>Date: Tue, 21 Jun 2016 12:18:15 -0400
>Subject: [PATCH] pull in sys/sysmacros.h when available
>
>This header provides major/minor/makedev funcs under most Linux C
>libs.  Pull it in to fix building with newer versions that drop the
>implicit include via sys/types.h.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94231
>Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>---
> configure.ac   | 3 ++-
> libkms/linux.c | 5 ++++-
> xf86drm.c      | 7 +++++--
> 3 files changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index a04ce877100c..90fc455ee14a 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -53,7 +53,8 @@ AC_USE_SYSTEM_EXTENSIONS
> AC_SYS_LARGEFILE
> AC_FUNC_ALLOCA
> 
>-AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h sys/select.h])
>+AC_HEADER_MAJOR
>+AC_CHECK_HEADERS([sys/sysctl.h sys/select.h])
> 
> # Initialize libtool
> LT_PREREQ([2.2])
>diff --git a/libkms/linux.c b/libkms/linux.c
>index 6e0da830fd2d..69eb1aa47ca4 100644
>--- a/libkms/linux.c
>+++ b/libkms/linux.c
>@@ -41,9 +41,12 @@
> #include <unistd.h>
> #include <sys/stat.h>
> #include <sys/types.h>
>-#ifdef HAVE_SYS_MKDEV_H
>+#ifdef MAJOR_IN_MKDEV
> #include <sys/mkdev.h>
> #endif
>+#ifdef MAJOR_IN_SYSMACROS
>+#include <sys/sysmacros.h>
>+#endif
> 
> #include "libdrm_macros.h"
> #include "internal.h"
>diff --git a/xf86drm.c b/xf86drm.c
>index 804a4134e47d..eb16e83616fa 100644
>--- a/xf86drm.c
>+++ b/xf86drm.c
>@@ -54,8 +54,11 @@
> #include <sys/ioctl.h>
> #include <sys/time.h>
> #include <stdarg.h>
>-#ifdef HAVE_SYS_MKDEV_H
>-# include <sys/mkdev.h> /* defines major(), minor(), and makedev() on Solaris */
>+#ifdef MAJOR_IN_MKDEV
>+#include <sys/mkdev.h>
>+#endif
>+#ifdef MAJOR_IN_SYSMACROS
>+#include <sys/sysmacros.h>
> #endif
> #include <math.h>
> 
>-- 
>2.8.2
>

Actions: View | Splinter Review

Attachments on bug 94231: 121865 | 121891 | 124642 | 124643

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.