| From 13a12900148e6b778d8532ca76ff38edcec5a45f Mon Sep 17 00:00:00 2001 |
| From: Mike Frysinger <vapier@gentoo.org> |
| Date: Mon, 28 Mar 2016 20:31:33 -0400 |
| Subject: [PATCH e2fsprogs] include sys/sysmacros.h as needed |
| |
| The minor/major/makedev macros are not entirely standard. glibc has had |
| the definitions in sys/sysmacros.h since the start, and wants to move away |
| from always defining them implicitly via sys/types.h (as this pollutes the |
| namespace in violation of POSIX). Other C libraries have already dropped |
| them. Since the configure script already checks for this header, use that |
| to pull in the header in files that use these macros. |
| |
| Signed-off-by: Mike Frysinger <vapier@gentoo.org> |
| |
| --- 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" |
| --- 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" |
| |
| --- 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" |
| --- a/lib/ext2fs/ismounted.c |
| +++ b/lib/ext2fs/ismounted.c |
| @@ -49,6 +49,9 @@ |
| #endif /* HAVE_GETMNTINFO */ |
| #include <string.h> |
| #include <sys/stat.h> |
| +#ifdef HAVE_SYS_SYSMACROS_H |
| +#include <sys/sysmacros.h> |
| +#endif |
| |
| #include "ext2_fs.h" |
| #include "ext2fs.h" |
| --- 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> |