40 lines
979 B
Diff
40 lines
979 B
Diff
|
From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Seifert <soap@gentoo.org>
|
||
|
|
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(-)
|
||
|
|
|
||
|
|
Index: htop-2.2.0/CRT.h
|
||
|
|
===================================================================
|
||
|
|
--- htop-2.2.0.orig/CRT.h
|
||
|
|
+++ htop-2.2.0/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
|
||
|
|
|