tools/mtd-utils: include sysmacros.h explicitly

glibc is moving to remove the include of sys/sysmacros.h from
sys/types.h, and some distros have done this early. Other libcs may
already lack this include. Include sysmacros.h explicitly.

Fixes: FS#1015

Signed-off-by: Alex Maclean <monkeh@monkeh.net>
[refresh patches]
Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Alex Maclean 2017-10-23 13:47:33 +01:00 committed by Mathias Kresin
parent 4a5de1f430
commit 855d210f65
2 changed files with 27 additions and 4 deletions

View File

@ -0,0 +1,25 @@
From 9a06f45ec71116d76ee4b268ebe1b33d45b06fc0 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 16 Apr 2016 22:10:43 -0400
Subject: [PATCH mtd-utils] include sys/sysmacros.h for major/minor/makedev
These functions have always been defined in sys/sysmacros.h under
Linux C libraries. For some, including sys/types.h implicitly
includes that as well, but glibc wants to deprecate that, and some
others already have. Include the header explicitly for the funcs.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/common.h | 1 +
1 file changed, 1 insertion(+)
--- a/include/common.h
+++ b/include/common.h
@@ -27,6 +27,7 @@
#include <fcntl.h>
#include <errno.h>
#include <inttypes.h>
+#include <sys/sysmacros.h>
#include "version.h"
#ifndef PROGRAM_NAME

View File

@ -1,7 +1,5 @@
Index: mtd-utils-1.5.2/mkfs.jffs2.c --- a/mkfs.jffs2.c
=================================================================== +++ b/mkfs.jffs2.c
--- mtd-utils-1.5.2.orig/mkfs.jffs2.c
+++ mtd-utils-1.5.2/mkfs.jffs2.c
@@ -108,7 +108,7 @@ static char *rootdir = default_rootdir; @@ -108,7 +108,7 @@ static char *rootdir = default_rootdir;
static int verbose = 0; static int verbose = 0;
static int squash_uids = 0; static int squash_uids = 0;