diff options
| author | Elliott Hughes <enh@google.com> | 2017-05-19 19:56:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-19 19:56:36 +0000 |
| commit | 5333fe2b4f3944bb3206329ea81a770760e39cf2 (patch) | |
| tree | 0fbb5b814c906fcea3dafa678f8d66be21737224 | |
| parent | 7a5d26829a7e115e617cf79aba636afae696ce23 (diff) | |
| parent | 14a94052fdca4dd0e01386d7b62668fe9c702fb7 (diff) | |
| download | e2fsprogs-5333fe2b4f3944bb3206329ea81a770760e39cf2.tar.gz | |
Merge "include sys/sysmacros.h as needed" am: 105f5ecfd8 am: 9e0e531734 am: 01b3b9a574
am: 14a94052fd
Change-Id: I05286de7d243823d9cb7455ce98d3bd5b465a1d9
| -rw-r--r-- | debugfs/debugfs.c | 3 | ||||
| -rw-r--r-- | lib/blkid/devname.c | 3 | ||||
| -rw-r--r-- | lib/blkid/devno.c | 3 | ||||
| -rw-r--r-- | lib/ext2fs/finddev.c | 3 | ||||
| -rw-r--r-- | lib/ext2fs/ismounted.c | 3 | ||||
| -rw-r--r-- | misc/create_inode.c | 4 | ||||
| -rw-r--r-- | misc/mk_hugefiles.c | 3 |
7 files changed, 22 insertions, 0 deletions
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 165f9248..72b5cbbe 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -26,6 +26,9 @@ extern char *optarg; #include <errno.h> #endif #include <fcntl.h> +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif #include "debugfs.h" #include "uuid/uuid.h" diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c index 58baa297..444afdc9 100644 --- a/lib/blkid/devname.c +++ b/lib/blkid/devname.c @@ -36,6 +36,9 @@ #if HAVE_SYS_MKDEV_H #include <sys/mkdev.h> #endif +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif #include <time.h> #include "blkidP.h" diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c index aa6eb907..480030f2 100644 --- a/lib/blkid/devno.c +++ b/lib/blkid/devno.c @@ -31,6 +31,9 @@ #if HAVE_SYS_MKDEV_H #include <sys/mkdev.h> #endif +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif #include "blkidP.h" diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c index 311608de..62fa0dbe 100644 --- a/lib/ext2fs/finddev.c +++ b/lib/ext2fs/finddev.c @@ -31,6 +31,9 @@ #if HAVE_SYS_MKDEV_H #include <sys/mkdev.h> #endif +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif #include "ext2_fs.h" #include "ext2fs.h" diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c index bcac0f15..7d524715 100644 --- a/lib/ext2fs/ismounted.c +++ b/lib/ext2fs/ismounted.c @@ -49,6 +49,9 @@ #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif #include "ext2_fs.h" #include "ext2fs.h" diff --git a/misc/create_inode.c b/misc/create_inode.c index dc362108..e7ff0a4e 100644 --- a/misc/create_inode.c +++ b/misc/create_inode.c @@ -22,6 +22,10 @@ #include <attr/xattr.h> #endif #include <sys/ioctl.h> +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif + #include <ext2fs/ext2fs.h> #include <ext2fs/ext2_types.h> #include <ext2fs/fiemap.h> diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c index 71a15c5d..00e95cdf 100644 --- a/misc/mk_hugefiles.c +++ b/misc/mk_hugefiles.c @@ -35,6 +35,9 @@ extern int optind; #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> +#ifdef HAVE_SYS_SYSMACROS_H +#include <sys/sysmacros.h> +#endif #include <libgen.h> #include <limits.h> #include <blkid/blkid.h> |