blob: ffd9b9f26692675d9ee6cf4386fcd8c18f1db782 (
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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 01f1c05702eb534271777648c976ab6402a5145b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 12 Aug 2020 23:18:30 -0700
Subject: [PATCH] Define mword16 and mword8 once
Defining them in .h meant they are defined in all .c files including
this .h file
Fixes build with gcc 10+
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tests.c | 9 +++++++++
types.h | 9 ---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests.c b/tests.c
index be1b350..4305bed 100644
--- a/tests.c
+++ b/tests.c
@@ -27,6 +27,15 @@ char progress[] = "-\\|/";
#define PROGRESSOFTEN 2500
#define ONE 0x00000001L
+union {
+ unsigned char bytes[UL_LEN/8];
+ ul val;
+} mword8;
+
+union {
+ unsigned short u16s[UL_LEN/16];
+ ul val;
+} mword16;
/* Function definitions. */
int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
diff --git a/types.h b/types.h
index ad7ce73..e14ea32 100644
--- a/types.h
+++ b/types.h
@@ -25,12 +25,3 @@ struct test {
int (*fp)();
};
-union {
- unsigned char bytes[UL_LEN/8];
- ul val;
-} mword8;
-
-union {
- unsigned short u16s[UL_LEN/16];
- ul val;
-} mword16;
--
2.28.0
|
