aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger2016-06-21 11:18:15 -0500
committerEmil Velikov2016-07-06 10:58:38 -0500
commit8c8d5dd76fb80637031e824a48ceaa0f9f65d2dd (patch)
tree1e270c4f8ec18d4c7e7b27b11e2d0f0f61442989
parent50d3c85bdb4ac0b3d546336605a722889aff7066 (diff)
downloadexternal-libgbm-8c8d5dd76fb80637031e824a48ceaa0f9f65d2dd.tar.gz
external-libgbm-8c8d5dd76fb80637031e824a48ceaa0f9f65d2dd.tar.xz
external-libgbm-8c8d5dd76fb80637031e824a48ceaa0f9f65d2dd.zip
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>
-rw-r--r--configure.ac3
-rw-r--r--libkms/linux.c5
-rw-r--r--xf86drm.c7
3 files changed, 11 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index a04ce877..90fc455e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,8 @@ AC_USE_SYSTEM_EXTENSIONS
53AC_SYS_LARGEFILE 53AC_SYS_LARGEFILE
54AC_FUNC_ALLOCA 54AC_FUNC_ALLOCA
55 55
56AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h sys/select.h]) 56AC_HEADER_MAJOR
57AC_CHECK_HEADERS([sys/sysctl.h sys/select.h])
57 58
58# Initialize libtool 59# Initialize libtool
59LT_PREREQ([2.2]) 60LT_PREREQ([2.2])
diff --git a/libkms/linux.c b/libkms/linux.c
index 6e0da830..69eb1aa4 100644
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -41,9 +41,12 @@
41#include <unistd.h> 41#include <unistd.h>
42#include <sys/stat.h> 42#include <sys/stat.h>
43#include <sys/types.h> 43#include <sys/types.h>
44#ifdef HAVE_SYS_MKDEV_H 44#ifdef MAJOR_IN_MKDEV
45#include <sys/mkdev.h> 45#include <sys/mkdev.h>
46#endif 46#endif
47#ifdef MAJOR_IN_SYSMACROS
48#include <sys/sysmacros.h>
49#endif
47 50
48#include "libdrm_macros.h" 51#include "libdrm_macros.h"
49#include "internal.h" 52#include "internal.h"
diff --git a/xf86drm.c b/xf86drm.c
index e99f2e2d..8a858efa 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -54,8 +54,11 @@
54#include <sys/ioctl.h> 54#include <sys/ioctl.h>
55#include <sys/time.h> 55#include <sys/time.h>
56#include <stdarg.h> 56#include <stdarg.h>
57#ifdef HAVE_SYS_MKDEV_H 57#ifdef MAJOR_IN_MKDEV
58# include <sys/mkdev.h> /* defines major(), minor(), and makedev() on Solaris */ 58#include <sys/mkdev.h>
59#endif
60#ifdef MAJOR_IN_SYSMACROS
61#include <sys/sysmacros.h>
59#endif 62#endif
60#include <math.h> 63#include <math.h>
61 64