Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity

When compiling with gcc the file /usr/include/machine/md_var.h is included. This header defines a function "void cpu_setup(u_int)" which clashes with the "static short cpu_setup" variable in src/freebsd.cc. (#686)

Browse Source 
The patch renames this variable.

Reported by: Piotr Kubaj <pkubaj at anongoth.pl>
Ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233616
This commit is contained in:
Guido Falsi 2018-12-02 16:29:56 +00:00 committed by Brenden Matthews
parent c1ef8c5cd4
commit 71a60672a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/freebsd.cc
View File

@ -76,7 +76,7 @@ __attribute__((gnu_inline)) inline void proc_find_top(struct process **cpu,
struct process **mem, struct process **mem,
struct process **time); struct process **time);
static short cpu_setup = 0; static short conky_cpu_setup = 0;
static int getsysctl(const char *name, void *ptr, size_t len) { static int getsysctl(const char *name, void *ptr, size_t len) {
size_t nlen = len; size_t nlen = len;
@ -301,9 +301,9 @@ int update_cpu_usage(void) {
extern void *global_cpu; extern void *global_cpu;
/* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */
if ((cpu_setup == 0) || (!info.cpu_usage)) { if ((conky_cpu_setup == 0) || (!info.cpu_usage)) {
get_cpu_count(); get_cpu_count();
cpu_setup = 1; conky_cpu_setup = 1;
} }
if (!global_cpu) { if (!global_cpu) {