linux-qubasis
linux oasis port as a qubes template
git clone https://9o.is/git/linux-qubasis.git
0001-Prevent-empty-top-level-declaration.patch
(1877B)
1 From 76c1b0d85878fb3eb6cba54b5a67ad3df095bad7 Mon Sep 17 00:00:00 2001
2 From: Michael Forney <mforney@mforney.org>
3 Date: Thu, 11 Jul 2019 00:12:19 -0700
4 Subject: [PATCH] Prevent empty top-level declaration
5 Upstream: https://lists.freedesktop.org/archives/pixman/2019-November/004896.html
6
7 The expansion of PIXMAN_DEFINE_THREAD_LOCAL(...) may end in a
8 function definition, so the following semicolon is considered an
9 empty top-level declaration, which is not allowed in ISO C.
10 ---
11 pixman/pixman-compiler.h | 6 +++---
12 pixman/pixman-implementation.c | 2 +-
13 2 files changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
16 index a02aa49..6394156 100644
17 --- a/pixman/pixman-compiler.h
18 +++ b/pixman/pixman-compiler.h
19 @@ -109,14 +109,14 @@
20 #if defined(PIXMAN_NO_TLS)
21
22 # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
23 - static type name
24 + static type name;
25 # define PIXMAN_GET_THREAD_LOCAL(name) \
26 (&name)
27
28 #elif defined(TLS)
29
30 # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
31 - static TLS type name
32 + static TLS type name;
33 # define PIXMAN_GET_THREAD_LOCAL(name) \
34 (&name)
35
36 @@ -176,7 +176,7 @@
37 #elif defined(_MSC_VER)
38
39 # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
40 - static __declspec(thread) type name
41 + static __declspec(thread) type name;
42 # define PIXMAN_GET_THREAD_LOCAL(name) \
43 (&name)
44
45 diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c
46 index 2c7de4c..5a2cbfe 100644
47 --- a/pixman/pixman-implementation.c
48 +++ b/pixman/pixman-implementation.c
49 @@ -63,7 +63,7 @@ typedef struct
50 } cache [N_CACHED_FAST_PATHS];
51 } cache_t;
52
53 -PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache);
54 +PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache)
55
56 static void
57 dummy_composite_rect (pixman_implementation_t *imp,
58 --
59 2.26.2
60