Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Fix multiple definitions when building in FreeBSD

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-14 22:58:02 +01:00
parent 4793655974
commit 53af0f379f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conky.cc
View File

@ -157,6 +157,10 @@ void *global_cpu = NULL;
unsigned int max_text_width = 0; unsigned int max_text_width = 0;
int ifup_strictness = IFUP_UP; int ifup_strictness = IFUP_UP;
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
extern kvm_t *kd;
#endif
int argc_copy; int argc_copy;
char** argv_copy; char** argv_copy;

2
src/freebsd.cc
View File

@ -67,6 +67,8 @@
#define FREEBSD_DEBUG #define FREEBSD_DEBUG
#endif #endif
kvm_t *kd;
__attribute__((gnu_inline)) inline void __attribute__((gnu_inline)) inline void
proc_find_top(struct process **cpu, struct process **mem); proc_find_top(struct process **cpu, struct process **mem);

2
src/freebsd.h
View File

@ -17,8 +17,6 @@
extern "C" { extern "C" {
#endif #endif
kvm_t *kd;
int get_entropy_avail(unsigned int *); int get_entropy_avail(unsigned int *);
int get_entropy_poolsize(unsigned int *); int get_entropy_poolsize(unsigned int *);