From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 23 Jan 2020 17:27:10 +0100 Subject: [PATCH 1/2] Fix GCC 10 switch to `-fno-common` default --- CRT.h | 6 +++--- linux/LinuxProcess.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CRT.h b/CRT.h index 933fe068e..65998ac6c 100644 --- a/CRT.h +++ b/CRT.h @@ -140,7 +140,7 @@ extern const char **CRT_treeStr; extern int CRT_delay; -int* CRT_colors; +extern int* CRT_colors; extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; @@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; extern int CRT_scrollWheelVAmount; -char* CRT_termType; +extern char* CRT_termType; // TODO move color scheme to Settings, perhaps? extern int CRT_colorScheme; -void *backtraceArray[128]; +extern void *backtraceArray[128]; #if HAVE_SETUID_ENABLED diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h index 6ce3037d2..cbd77be97 100644 --- a/linux/LinuxProcess.h +++ b/linux/LinuxProcess.h @@ -144,7 +144,7 @@ typedef struct LinuxProcess_ { #endif -long long btime; /* semi-global */ +extern long long btime; /* semi-global */ extern ProcessFieldData Process_fields[]; From 17bad17a92efd148a837a783aabe837d271156b5 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 23 Jan 2020 17:27:13 +0100 Subject: [PATCH 2/2] Switch Travis to catch GCC 10 issues --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22a5e07c0..1cb7a184a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ os: - linux - osx -script: ./autogen.sh && ./configure && make +script: ./autogen.sh && ./configure CFLAGS="-O2 -fno-common" && make