From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 14 Mar 2016 21:44:49 +0000 (-0400)
Subject: include sys/sysmacros.h in more places
X-Git-Tag: v230~268^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2838%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/basic/macro.h b/src/basic/macro.h
index c34441d75dc..b36a95675ad 100644
--- a/src/basic/macro.h
+++ b/src/basic/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/basic/util.h b/src/basic/util.h
index e095254b57d..286db051599 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -36,6 +36,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
index eb58740d26d..3f6d0ed16c2 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
diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
index 5bfca6ececa..c1d07561d72 100644
--- a/src/systemd/sd-device.h
+++ b/src/systemd/sd-device.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <inttypes.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 
 #include "_sd-common.h"
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 56590517efa..8433e8d9f26 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -19,6 +19,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 
 #include "libudev.h"