1*4882a593SmuzhiyunFrom 43a4bc6b750c37f585d03b14941f3633ed5348d8 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 9 Jun 2020 11:30:38 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Fix compilation with GCC10 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFixed compilation with -fno-common, which enabled in GCC 10 by default. 7*4882a593SmuzhiyunSee https://bugs.gentoo.org/707438. 8*4882a593Smuzhiyun[Retrieved from: 9*4882a593Smuzhiyunhttps://github.com/owfs/owfs/commit/43a4bc6b750c37f585d03b14941f3633ed5348d8] 10*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun module/owserver/src/c/owserver.c | 2 ++ 13*4882a593Smuzhiyun module/owserver/src/include/owserver.h | 2 +- 14*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 1 deletion(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c 17*4882a593Smuzhiyunindex db29988e..2ed29161 100644 18*4882a593Smuzhiyun--- a/module/owserver/src/c/owserver.c 19*4882a593Smuzhiyun+++ b/module/owserver/src/c/owserver.c 20*4882a593Smuzhiyun@@ -36,6 +36,8 @@ 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun #include "owserver.h" 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun+pthread_mutex_t persistence_mutex ; 25*4882a593Smuzhiyun+ 26*4882a593Smuzhiyun /* --- Prototypes ------------ */ 27*4882a593Smuzhiyun static void SetupAntiloop(int argc, char **argv); 28*4882a593Smuzhiyun 29*4882a593Smuzhiyundiff --git a/module/owserver/src/include/owserver.h b/module/owserver/src/include/owserver.h 30*4882a593Smuzhiyunindex 8be582f0..a257ed02 100644 31*4882a593Smuzhiyun--- a/module/owserver/src/include/owserver.h 32*4882a593Smuzhiyun+++ b/module/owserver/src/include/owserver.h 33*4882a593Smuzhiyun@@ -18,7 +18,7 @@ 34*4882a593Smuzhiyun #include "ow.h" 35*4882a593Smuzhiyun #include "ow_connection.h" 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun-pthread_mutex_t persistence_mutex ; 38*4882a593Smuzhiyun+extern pthread_mutex_t persistence_mutex ; 39*4882a593Smuzhiyun #define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; 40*4882a593Smuzhiyun #define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; 41*4882a593Smuzhiyun 42