diff options
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | libkms/linux.c | 5 | ||||
-rw-r--r-- | xf86drm.c | 7 |
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 | |||
53 | AC_SYS_LARGEFILE | 53 | AC_SYS_LARGEFILE |
54 | AC_FUNC_ALLOCA | 54 | AC_FUNC_ALLOCA |
55 | 55 | ||
56 | AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h sys/select.h]) | 56 | AC_HEADER_MAJOR |
57 | AC_CHECK_HEADERS([sys/sysctl.h sys/select.h]) | ||
57 | 58 | ||
58 | # Initialize libtool | 59 | # Initialize libtool |
59 | LT_PREREQ([2.2]) | 60 | LT_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" |
@@ -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 | ||