From 0ffd58b223e24779420130522ea8ee359505f493 Mon Sep 17 00:00:00 2001 From: Gang He Date: Mon, 4 Sep 2017 14:08:59 +0800 Subject: [PATCH] fsck.ocfs2: fix compile error when glibc upgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2, the compile error messages like, In file included from /usr/include/string.h:431:0, from ../include/ocfs2/ocfs2.h:41, from pass4.c:32: include/strings.h:37:1: error: unknown type name ‘errcode_t’; did you mean ‘mode_t’? errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string, ^~~~~~~~~ mode_t --- fsck.ocfs2/Makefile | 2 +- fsck.ocfs2/include/{strings.h => o2fsck_strings.h} | 0 fsck.ocfs2/pass2.c | 2 +- fsck.ocfs2/pass5.c | 2 +- fsck.ocfs2/strings.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename fsck.ocfs2/include/{strings.h => o2fsck_strings.h} (100%) diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile index 051ed742..baf1994d 100644 --- a/fsck.ocfs2/Makefile +++ b/fsck.ocfs2/Makefile @@ -64,7 +64,7 @@ HFILES = include/fsck.h \ include/problem.h \ include/refcount.h \ include/slot_recovery.h \ - include/strings.h \ + include/o2fsck_strings.h \ include/util.h diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/o2fsck_strings.h similarity index 100% rename from fsck.ocfs2/include/strings.h rename to fsck.ocfs2/include/o2fsck_strings.h diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c index 181febb9..a48a50b5 100644 --- a/fsck.ocfs2/pass2.c +++ b/fsck.ocfs2/pass2.c @@ -43,7 +43,7 @@ #include "fsck.h" #include "pass2.h" #include "problem.h" -#include "strings.h" +#include "o2fsck_strings.h" #include "util.h" static const char *whoami = "pass2"; diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c index 5c2d899f..bfad1b72 100644 --- a/fsck.ocfs2/pass5.c +++ b/fsck.ocfs2/pass5.c @@ -40,7 +40,7 @@ #include "fsck.h" #include "pass5.h" #include "problem.h" -#include "strings.h" +#include "o2fsck_strings.h" #include "util.h" static const char *whoami = "pass5"; diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c index 4ad37822..8a7a8d9d 100644 --- a/fsck.ocfs2/strings.c +++ b/fsck.ocfs2/strings.c @@ -31,7 +31,7 @@ #include "ocfs2/ocfs2.h" #include "fsck.h" -#include "strings.h" +#include "o2fsck_strings.h" #include "util.h" struct string_entry { From 03be837c7d0b9be393ffb555879c49e6212fbd0f Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Thu, 25 Jan 2018 13:05:27 +0100 Subject: [PATCH] mounted.ocfs2: use include for makedev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mounted.c: In function ‘build_partition_list’: mounted.c:354:13: warning: In the GNU C Library, "makedev" is defined by . For historical compatibility, it is currently defined by as well, but we plan to remove this soon. To use "makedev", include directly. If you did not intend to use a system-defined macro "makedev", you should undefine it after including . makedev(major, minor), &devname); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ --- mounted.ocfs2/mounted.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mounted.ocfs2/mounted.c b/mounted.ocfs2/mounted.c index 1576f902..090ab4ed 100644 --- a/mounted.ocfs2/mounted.c +++ b/mounted.ocfs2/mounted.c @@ -25,7 +25,7 @@ #define _LARGEFILE64_SOURCE #define _GNU_SOURCE /* Because libc really doesn't want us using O_DIRECT? */ -#include +#include #include #include #include