1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From 0ffd58b223e24779420130522ea8ee359505f493 Mon Sep 17 00:00:00 2001
From: Gang He <ghe@suse.com>
Date: Mon, 4 Sep 2017 14:08:59 +0800
Subject: [PATCH] fsck.ocfs2: fix compile error when glibc upgrade
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
Upstream-Status: Backport [https://github.com/markfasheh/ocfs2-tools/commit/0ffd58b223e24779420130522ea8ee359505f493]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
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 051ed74..baf1994 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 181febb..a48a50b 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 5c2d899..bfad1b7 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 4ad3782..8a7a8d9 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 {
--
2.7.4
|
