]>
Commit | Line | Data |
---|---|---|
31bd86f6 JR |
1 | From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Tsoy <alexander@tsoy.me> | |
3 | Date: Tue, 28 Jan 2020 22:21:01 +0300 | |
4 | Subject: [PATCH] Fix build with -fno-common | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | GCC 10 defaults to -fno-common | |
10 | ||
11 | Signed-off-by: Petr Písař <ppisar@redhat.com> | |
12 | --- | |
13 | src/util.c | 3 +++ | |
14 | src/util.h | 6 +++--- | |
15 | 2 files changed, 6 insertions(+), 3 deletions(-) | |
16 | ||
17 | diff --git a/src/util.c b/src/util.c | |
18 | index a82a1a4..6a52ebf 100644 | |
19 | --- a/src/util.c | |
20 | +++ b/src/util.c | |
21 | @@ -47,6 +47,9 @@ int hxl = 0; | |
22 | #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD | |
23 | MUTEX(x11Mutex); | |
24 | MUTEX(scrollMutex); | |
25 | +MUTEX(clientMutex); | |
26 | +MUTEX(inputMutex); | |
27 | +MUTEX(pointerMutex); | |
28 | #endif | |
29 | ||
30 | int nfix(int i, int n); | |
31 | diff --git a/src/util.h b/src/util.h | |
32 | index 35c1afd..99b5dd1 100644 | |
33 | --- a/src/util.h | |
34 | +++ b/src/util.h | |
35 | @@ -102,9 +102,9 @@ extern struct timeval _mysleep; | |
36 | #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD | |
37 | extern MUTEX(x11Mutex); | |
38 | extern MUTEX(scrollMutex); | |
39 | -MUTEX(clientMutex); | |
40 | -MUTEX(inputMutex); | |
41 | -MUTEX(pointerMutex); | |
42 | +extern MUTEX(clientMutex); | |
43 | +extern MUTEX(inputMutex); | |
44 | +extern MUTEX(pointerMutex); | |
45 | #endif | |
46 | ||
47 | #define X_INIT INIT_MUTEX(x11Mutex) | |
48 | -- | |
49 | 2.21.1 | |
50 |