Fix GCC 10 switch to -fno-common default

Switch Travis to catch GCC 10 issues Squashed cherry-pick of hishamhm#981
aswild · Apr 9, 2020 · 7f77d12 · 7f77d12
1 parent 5f06506
commit 7f77d12
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
diff --git a/CRT.h b/CRT.h
@@ -146,21 +146,21 @@ extern const char **CRT_treeStr;
 
 extern int CRT_delay;
 
-int* CRT_colors;
+extern int* CRT_colors;
 
 extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
 
 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
@@ -187,7 +187,7 @@ typedef struct LinuxProcess_ {
 #endif
 
 
-long long btime; /* semi-global */
+extern long long btime; /* semi-global */
 
 extern ProcessFieldData Process_fields[];
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ os: @@
       - linux
       - osx
-    script: ./autogen.sh && ./configure && make
+    script: ./autogen.sh && ./configure CFLAGS="-O2 -fno-common" && make