Attachment #217436 for bug #248823

View | Details | Raw Unified | Return to bug 248823
Collapse All | Expand All




--- CRT.h.orig	2018-04-10 13:42:59 UTC
+++ 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
 





--- freebsd/FreeBSDProcessList.c.orig	2018-04-10 13:42:59 UTC
+++ freebsd/FreeBSDProcessList.c
@@ -28,8 +28,9 @@ in the source distribution for its full text.
 #include <sys/resource.h>
 
 #define JAIL_ERRMSGLEN	1024
+*/
 char jail_errmsg[JAIL_ERRMSGLEN];
-
+/*
 typedef struct CPUData_ {
 
    double userPercent;
@@ -296,31 +297,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
    //
    // htop_used   = active + (wired - arc)
    // htop_cache  = buffers + cache + arc

Line 0 Link Here

(-)sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h (+11 lines)
	1	--- freebsd/FreeBSDProcessList.h.orig 2018-04-10 13:42:59 UTC
	2	+++ freebsd/FreeBSDProcessList.h
	3	@@ -17,7 +17,7 @@ in the source distribution for its full text.
	4	#include <sys/resource.h>
	5
	6	#define JAIL_ERRMSGLEN 1024
	7	-char jail_errmsg[JAIL_ERRMSGLEN];
	8	+extern char jail_errmsg[JAIL_ERRMSGLEN];
	9
	10	typedef struct CPUData_ {
	11

Return to bug 248823

Line 0 Link Here

(-)sysutils/htop/files/patch-CRT.h (+27 lines)
	1	--- CRT.h.orig 2018-04-10 13:42:59 UTC
	2	+++ CRT.h
	3	@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
	4
	5	extern int CRT_delay;
	6
	7	-int* CRT_colors;
	8	+extern int* CRT_colors;
	9
	10	extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
	11
	12	@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
	13
	14	extern int CRT_scrollWheelVAmount;
	15
	16	-char* CRT_termType;
	17	+extern char* CRT_termType;
	18
	19	// TODO move color scheme to Settings, perhaps?
	20
	21	extern int CRT_colorScheme;
	22
	23	-void *backtraceArray[128];
	24	+extern void *backtraceArray[128];
	25
	26	#if HAVE_SETUID_ENABLED
	27

Lines 4-10 Link Here

(-)sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c (-1 / +12 lines)
4		4
5	--- freebsd/FreeBSDProcessList.c.orig 2018-04-10 13:42:59 UTC	5	--- freebsd/FreeBSDProcessList.c.orig 2018-04-10 13:42:59 UTC
6	+++ freebsd/FreeBSDProcessList.c	6	+++ freebsd/FreeBSDProcessList.c
7	@@ -296,31 +296,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P	7	@@ -28,8 +28,9 @@ in the source distribution for its full text.
		8	#include <sys/resource.h>
		9
		10	#define JAIL_ERRMSGLEN 1024
		11	+*/
		12	char jail_errmsg[JAIL_ERRMSGLEN];
		13	-
		14	+/*
		15	typedef struct CPUData_ {
		16
		17	double userPercent;
		18	@@ -296,31 +297,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
8	//	19	//
9	// htop_used = active + (wired - arc)	20	// htop_used = active + (wired - arc)
10	// htop_cache = buffers + cache + arc	21	// htop_cache = buffers + cache + arc