summaryrefslogtreecommitdiff
blob: 61cda995af4bf3465242a43d4b402b20bedddb50 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Backported to 216 adapting headers locations

From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 14 Mar 2016 17:44:49 -0400
Subject: [PATCH] include sys/sysmacros.h in more places

Since glibc is moving away from implicitly including sys/sysmacros.h
all the time via sys/types.h, include the header directly in more
places.  This seems to cover most makedev/major/minor usage.
---
 src/shared/macro.h       | 1 +
 src/shared/util.h        | 1 +
 src/libudev/libudev.h   | 1 +
 src/udev/udev.h         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/shared/macro.h b/src/shared/macro.h
index c34441d75d..b36a95675a 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -23,6 +23,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <sys/param.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 
 #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
index eb58740d26..3f6d0ed16c 100644
--- a/src/libudev/libudev.h
+++ b/src/libudev/libudev.h
@@ -21,6 +21,7 @@
 #define _LIBUDEV_H_
 
 #include <stdarg.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 
 #ifdef __cplusplus
--- a/src/shared/util.h~  2014-08-19 16:47:52.000000000 +0200
+++ b/src/shared/util.h   2017-10-21 17:58:54.294946349 +0200
@@ -35,6 +35,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <dirent.h>
 #include <sys/resource.h>
 #include <stddef.h>
--- a/src/udev/udev.h~    2014-07-29 19:51:00.000000000 +0200
+++ b/src/udev/udev.h     2017-10-21 17:59:50.026412561 +0200
@@ -20,6 +20,7 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
+#include <sys/sysmacros.h>
 #include <signal.h>
 
 #include "macro.h"