mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Code Issues Releases Activity

Fix build with GCC-based architectures.

Browse Source 
Fix changes the name of a variable to avoid clash with a function
name defined in an include file used by GCC.

PR:		233616
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>
This commit is contained in:
Guido Falsi 2018-11-29 10:33:29 +00:00
parent 9f9086573f
commit f12326e43d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=486162
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sysutils/conky/files/patch-src_freebsd.cc Normal file
View File

@ -0,0 +1,23 @@
--- src/freebsd.cc.orig 2018-11-28 18:50:47 UTC
+++ src/freebsd.cc
@@ -78,7 +78,7 @@ std::mutex kvm_proc_mutex;
__attribute__((gnu_inline)) inline void
proc_find_top(struct process **cpu, struct process **mem, 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)
{
@@ -338,9 +338,9 @@ int update_cpu_usage(void)
extern void* global_cpu;
/* 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();
- cpu_setup = 1;
+ conky_cpu_setup = 1;
}
if (!global_cpu) {