blob: 918fa9bab73318471f111740b2a31a7c393e55ff (
plain)
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
|
From a1c83bc4676dbeaff0e1c540aeeb7c31e17aae74 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 24 Sep 2020 14:20:58 +0800
Subject: [PATCH] ip_carp.h: use __attribute__((packed)) instead of __packed
Fix gcc10 build error about multiple definition of __packed.
Upstream-Status: Pending
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
src/ip_carp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ip_carp.h b/src/ip_carp.h
index 9504a8e..d1e3368 100644
--- a/src/ip_carp.h
+++ b/src/ip_carp.h
@@ -70,7 +70,7 @@ struct carp_header {
u_int16_t carp_cksum;
u_int32_t carp_counter[2];
unsigned char carp_md[20]; /* SHA1 HMAC */
-} __packed;
+} __attribute__((packed));
#define CARP_DFLTTL 255
--
2.17.1
|
