f5bf4978d8
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/kexec-tools#041ba89902961b5490a7143d9596dc00d732cba0
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 2837fb1f5f8362976c188b30ebe50dc8b0377f64 Mon Sep 17 00:00:00 2001
|
|
From: Kairui Song <kasong@redhat.com>
|
|
Date: Wed, 29 Jan 2020 11:33:18 +0800
|
|
Subject: [PATCH] Remove duplicated variable declaration
|
|
|
|
When building on Fedora 32, following error is observed:
|
|
|
|
...
|
|
/usr/bin/ld: ../eppic/libeppic/libeppic.a(eppic_stat.o):/builddir/build/BUILD/kexec-tools-2.0.20/eppic/libeppic/eppic.h:474: multiple definition of `lastv';
|
|
../eppic/libeppic/libeppic.a(eppic_func.o):/builddir/build/BUILD/kexec-tools-2.0.20/eppic/libeppic/eppic.h:474: first defined here
|
|
...
|
|
|
|
And apparently, the variable is wrongly declared multiple times. So
|
|
remove duplicated declaration.
|
|
|
|
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
---
|
|
libeppic/eppic.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libeppic/eppic.h b/libeppic/eppic.h
|
|
index 5664583..836b475 100644
|
|
--- a/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/eppic.h
|
|
+++ b/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/eppic.h
|
|
@@ -471,7 +471,7 @@ type_t *eppic_addstorage(type_t *t1, type_t *t2);
|
|
type_t *eppic_getvoidstruct(int ctype);
|
|
|
|
extern int lineno, needvar, instruct, nomacs, eppic_legacy;
|
|
-node_t *lastv;
|
|
+extern node_t *lastv;
|
|
|
|
#define NULLNODE ((node_t*)0)
|
|
|
|
--
|
|
2.24.1
|
|
|