libubigen: remove unnecessary include
PATCH 1/1 libubigen: remove unnecessary include
libubigen.h does not use any symbol from mtd/ubi-media.h, so remove it from includes.
--- include/libubigen.h | 1 - 1 file changed, 1 deletion(-)
include/libubigen.h +0 -1
@@ -26,7 +26,6 @@#define __LIBUBIGEN_H__#include <stdint.h> -#include <mtd/ubi-media.h> #ifdef __cplusplusextern "C" {
Signature · 6 lines
2.25.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH 1/1 libubi: remove private kernel header from includes
libubi.h includes ubi-media.h which was made private in the kernel a long time ago. There are users of libubi.h, e.g. swupdate, which have to have ubi-media.h available at build time with this inclusion.
However, libubi.h uses only one symbol from ubi-media.h. Define that symbol in the header to enable using libubi.h without installing ubi-media.h.
Make up for the transitive symbol use in ubiformat.c by including ubi-media.h.
--- include/libubi.h | 4 +++- ubi-utils/ubiformat.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
include/libubi.h +3 -1
@@ -26,7 +26,6 @@#include <ctype.h> #include <stdint.h> #include <mtd/ubi-user.h> -#include <mtd/ubi-media.h> #ifdef __cplusplusextern "C" {
@@ -38,6 +37,9 @@ extern "C" {/* Maximum physical eraseblock size in bytes */ #define UBI_MAX_PEB_SZ (2*1024*1024) +/* The maximum volume name length (from Linux's ubi-media.h) */ +#define UBI_VOL_NAME_MAX 127 +/* UBI library descriptor */ typedef void *libubi_t ;
ubi-utils/ubiformat.c +1 -0
@@ -38,6 +38,7 @@#include <getopt.h> #include <fcntl.h> +#include <mtd/ubi-media.h> #include <libubi.h> #include <libmtd.h> #include <libscan.h>
Signature · 6 lines
2.25.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
David Oberhollenzer
AppliedRe: [PATCH] libubi: remove private kernel header from includes
Applied to mtd-utils.git master.
Thanks,
David
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/