36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From 77a79358cc72174cbba0dd44e313f6d06d96dbf4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ken Gaillot <kgaillot@redhat.com>
|
||
|
|
Date: Thu, 2 Jan 2020 09:51:52 -0600
|
||
|
|
Subject: [PATCH] Refactor: attrd: properly declare global variables as extern
|
||
|
|
in header
|
||
|
|
|
||
|
|
Restores buildability with GCC 10
|
||
|
|
---
|
||
|
|
daemons/attrd/pacemaker-attrd.h | 8 +++++---
|
||
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/daemons/attrd/pacemaker-attrd.h b/daemons/attrd/pacemaker-attrd.h
|
||
|
|
index cc8e29ee1e..7b5ba03388 100644
|
||
|
|
--- a/daemons/attrd/pacemaker-attrd.h
|
||
|
|
+++ b/daemons/attrd/pacemaker-attrd.h
|
||
|
|
@@ -1,5 +1,7 @@
|
||
|
|
/*
|
||
|
|
- * Copyright 2013-2018 Andrew Beekhof <andrew@beekhof.net>
|
||
|
|
+ * Copyright 2013-2020 the Pacemaker project contributors
|
||
|
|
+ *
|
||
|
|
+ * The version control history for this file may have further details.
|
||
|
|
*
|
||
|
|
* This source code is licensed under the GNU General Public License version 2
|
||
|
|
* or later (GPLv2+) WITHOUT ANY WARRANTY.
|
||
|
|
@@ -106,8 +108,8 @@ typedef struct attribute_value_s {
|
||
|
|
gboolean seen;
|
||
|
|
} attribute_value_t;
|
||
|
|
|
||
|
|
-crm_cluster_t *attrd_cluster;
|
||
|
|
-GHashTable *attributes;
|
||
|
|
+extern crm_cluster_t *attrd_cluster;
|
||
|
|
+extern GHashTable *attributes;
|
||
|
|
|
||
|
|
#define attrd_send_ack(client, id, flags) \
|
||
|
|
crm_ipcs_send_ack((client), (id), (flags), "ack", __FUNCTION__, __LINE__)
|