fix gcc 10 multiple definition error
This commit is contained in:
parent
6873023d15
commit
baf5613727
25
0009-fix-gcc-10-multiple-definition-error.patch
Normal file
25
0009-fix-gcc-10-multiple-definition-error.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From d2e924aacf46884c1168caa4272eaf6e99c3c0c0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yangzhao_kl <yangzhao1@kylinos.cn>
|
||||||
|
Date: Thu, 26 Aug 2021 11:13:45 +0800
|
||||||
|
Subject: [PATCH] fix gcc 10 multiple definition error
|
||||||
|
|
||||||
|
---
|
||||||
|
src/pacemaker.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/pacemaker.h b/src/pacemaker.h
|
||||||
|
index ccc8861..3a81724 100644
|
||||||
|
--- a/src/pacemaker.h
|
||||||
|
+++ b/src/pacemaker.h
|
||||||
|
@@ -32,7 +32,7 @@ struct ticket_handler {
|
||||||
|
int (*del_attr) (struct ticket_config *tk, const char *a);
|
||||||
|
};
|
||||||
|
|
||||||
|
-struct ticket_handler pcmk_handler;
|
||||||
|
+extern struct ticket_handler pcmk_handler;
|
||||||
|
const char * interpret_rv(int rv);
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
2.31.1.windows.1
|
||||||
|
|
||||||
@ -50,6 +50,7 @@ Patch5: 0005-test-drop-comment-out-superfluous-imports.patch
|
|||||||
Patch6: 0006-test-avoid-dangerous-mutable-sticky-default-value.patch
|
Patch6: 0006-test-avoid-dangerous-mutable-sticky-default-value.patch
|
||||||
Patch7: 0007-test-unit-test.py-daemon-will-not-stay-in-foreground.patch
|
Patch7: 0007-test-unit-test.py-daemon-will-not-stay-in-foreground.patch
|
||||||
Patch8: 0008-Refactor-fix-strncpy-may-miss-trailing-null-byte-war.patch
|
Patch8: 0008-Refactor-fix-strncpy-may-miss-trailing-null-byte-war.patch
|
||||||
|
Patch9: 0009-fix-gcc-10-multiple-definition-error.patch
|
||||||
|
|
||||||
# direct build process dependencies
|
# direct build process dependencies
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user