blob: 85c1e5ece64634f33a32979d39ef0a544f5c71ac (
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
31
32
33
34
35
36
37
38
39
40
41
|
From 132c4a64dd3ad48006bb426d1db41eb10ab0188d Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Mon, 27 Jan 2020 10:52:10 +0100
Subject: [PATCH] Fix building with gcc-10
gcc-10 defaults to -fno-common which reveals a symbol conflict with
bit_string. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678
---
crypto/math/datatypes.c | 2 +-
test/util.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c
index 001584c..4fcb396 100644
--- a/crypto/math/datatypes.c
+++ b/crypto/math/datatypes.c
@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
/* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
-char bit_string[MAX_PRINT_STRING_LEN];
+static char bit_string[MAX_PRINT_STRING_LEN];
uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
{
diff --git a/test/util.c b/test/util.c
index 2abc28e..c0f7614 100644
--- a/test/util.c
+++ b/test/util.c
@@ -49,7 +49,7 @@
#include <stdint.h>
/* include space for null terminator */
-char bit_string[MAX_PRINT_STRING_LEN + 1];
+static char bit_string[MAX_PRINT_STRING_LEN + 1];
static inline int hex_char_to_nibble(uint8_t c)
{
--
2.26.2
|
