1*4882a593SmuzhiyunFrom f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Sergei Trofimovich <slyfox@gentoo.org> 3*4882a593SmuzhiyunDate: Sun, 19 Jan 2020 19:53:41 +0000 4*4882a593SmuzhiyunSubject: [PATCH] src/headers/daemon.h: avoid redefinition of 5*4882a593Smuzhiyun 'last_selection_time' 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunNoticed build failure on gcc-10 as: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun``` 10*4882a593Smuzhiyungcc -L/home/slyfox/dev/git/gpm/src -o gpm mice.o ... report.o tools.o -lm 11*4882a593Smuzhiyunld: twiddler.o:gpm/src/headers/daemon.h:183: 12*4882a593Smuzhiyun multiple definition of `last_selection_time'; mice.o:gpm/src/headers/daemon.h:183: first defined here 13*4882a593Smuzhiyunld: synaptics.o:git/gpm/src/headers/daemon.h:183: 14*4882a593Smuzhiyun multiple definition of `last_selection_time'; mice.o:git/gpm/src/headers/daemon.h:183: first defined here 15*4882a593Smuzhiyun``` 16*4882a593Smuzhiyun 17*4882a593Smuzhiyungcc-10 will change the default from -fcommon to fno-common: 18*4882a593Smuzhiyunhttps://gcc.gnu.org/PR85678. 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunThe error also happens if CFLAGS=-fno-common passed explicitly. 21*4882a593Smuzhiyun 22*4882a593SmuzhiyunSigned-off-by: Sergei Trofimovich <slyfox@gentoo.org> 23*4882a593SmuzhiyunSigned-off-by: Heiko Thiery <heiko.thiery@gmail.com> 24*4882a593Smuzhiyun--- 25*4882a593Smuzhiyun src/headers/daemon.h | 2 +- 26*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/src/headers/daemon.h b/src/headers/daemon.h 29*4882a593Smuzhiyunindex a8936ad..24a1a97 100644 30*4882a593Smuzhiyun--- a/src/headers/daemon.h 31*4882a593Smuzhiyun+++ b/src/headers/daemon.h 32*4882a593Smuzhiyun@@ -180,7 +180,7 @@ extern struct mouse_features mouse_table[3], 33*4882a593Smuzhiyun extern Gpm_Type mice[]; 34*4882a593Smuzhiyun extern Gpm_Type *repeated_type; 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun-time_t last_selection_time; 37*4882a593Smuzhiyun+extern time_t last_selection_time; 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun-- 42*4882a593Smuzhiyun2.20.1 43*4882a593Smuzhiyun 44