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 c34441d75dcd6f6e94cb91cb6bc5170ee234527d..b36a95675ad7224ec1a4cc9b525ec065a78eec0f 100644 (file)
--- 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 e095254b57d2861656f37b26b61a0f4b8b3e0827..286db051599679ec9d2b0b191e47dc744d1c45da 100644 (file)
--- 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 eb58740d26db35505a646923770c0ef9d9ad57f6..3f6d0ed16c2f603729390768d151747784ae2771 100644 (file)
--- 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 5bfca6ececabb36252211d82b168517b50811047..c1d07561d720c31b708c94f2af18bfe84eabde24 100644 (file)
--- 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 56590517efa1e440caf327682185da07811c94f4..8433e8d9f2661c5dfd73487da6cbf9f1f44c50e1 100644 (file)
--- 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"