1*4882a593Smuzhiyunfix build with gcc 10 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunDefine quiet as static to avoid the following build failure with gcc 10 4*4882a593Smuzhiyun(which defaults to -fno-common): 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun/home/naourr/work/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: CMakeFiles/get-edid.dir/i2c.c.o:(.bss+0x0): multiple definition of `quiet'; CMakeFiles/get-edid.dir/get-edid.c.o:(.bss+0x0): first defined here 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunFixes: 9*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/28bde8049b6610273bceae26eca407c819a37dcd 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 12*4882a593Smuzhiyun[Upstream status: sent to pyrophobicman@gmail.com] 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff -Nura read-edid-3.0.2.orig/get-edid/classic.c read-edid-3.0.2/get-edid/classic.c 15*4882a593Smuzhiyun--- read-edid-3.0.2.orig/get-edid/classic.c 2020-09-25 23:25:01.928805414 +0200 16*4882a593Smuzhiyun+++ read-edid-3.0.2/get-edid/classic.c 2020-09-25 23:26:37.440807301 +0200 17*4882a593Smuzhiyun@@ -26,7 +26,7 @@ 18*4882a593Smuzhiyun #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } 21*4882a593Smuzhiyun-int quiet; 22*4882a593Smuzhiyun+static int quiet; 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun real_ptr far_ptr_to_real_ptr( uint32 farptr ) 25*4882a593Smuzhiyun { 26*4882a593Smuzhiyundiff -Nura read-edid-3.0.2.orig/get-edid/get-edid.c read-edid-3.0.2/get-edid/get-edid.c 27*4882a593Smuzhiyun--- read-edid-3.0.2.orig/get-edid/get-edid.c 2020-09-25 23:25:01.928805414 +0200 28*4882a593Smuzhiyun+++ read-edid-3.0.2/get-edid/get-edid.c 2020-09-25 23:28:20.740809341 +0200 29*4882a593Smuzhiyun@@ -9,7 +9,7 @@ 30*4882a593Smuzhiyun #include <stdlib.h> 31*4882a593Smuzhiyun #include <string.h> 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun-int quiet=0; 34*4882a593Smuzhiyun+static int quiet=0; 35*4882a593Smuzhiyun int i2conly=0; //0=both, 1=i2conly, 2=classiconly 36*4882a593Smuzhiyun int i2cbus=-1; 37*4882a593Smuzhiyun int classmon=0; 38*4882a593Smuzhiyundiff -Nura read-edid-3.0.2.orig/get-edid/i2c.c read-edid-3.0.2/get-edid/i2c.c 39*4882a593Smuzhiyun--- read-edid-3.0.2.orig/get-edid/i2c.c 2020-09-25 23:25:01.928805414 +0200 40*4882a593Smuzhiyun+++ read-edid-3.0.2/get-edid/i2c.c 2020-09-25 23:28:32.152809567 +0200 41*4882a593Smuzhiyun@@ -15,7 +15,7 @@ 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun-int quiet; 46*4882a593Smuzhiyun+static int quiet; 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } 49*4882a593Smuzhiyun 50