mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-11-05 21:07:52 +00:00
APM is i386-only thing.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@336 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
3441f53fc6
commit
ac63110dad
@ -844,7 +844,7 @@ enum text_object_type {
|
||||
OBJ_upspeedgraph,
|
||||
OBJ_uptime,
|
||||
OBJ_uptime_short,
|
||||
#ifdef __FreeBSD__
|
||||
#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||
OBJ_apm_adapter,
|
||||
OBJ_apm_battery_time,
|
||||
OBJ_apm_battery_life,
|
||||
@ -1686,8 +1686,8 @@ int a = stippled_borders, b = 1;
|
||||
}
|
||||
END OBJ(uptime_short, INFO_UPTIME) END OBJ(uptime, INFO_UPTIME) END
|
||||
OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
|
||||
#ifdef __FreeBSD__
|
||||
OBJ(apm_adapter, 0) END
|
||||
#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||
OBJ(apm_adapter, 0) END
|
||||
OBJ(apm_battery_life, 0) END
|
||||
OBJ(apm_battery_time, 0) END
|
||||
#endif /* __FreeBSD__ */
|
||||
@ -2713,7 +2713,7 @@ static void generate_text()
|
||||
format_seconds(p, n, (int) cur->uptime);
|
||||
}
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||
OBJ(apm_adapter) {
|
||||
snprintf(p, n, "%s", get_apm_adapter());
|
||||
}
|
||||
|
@ -30,7 +30,7 @@
|
||||
#endif
|
||||
#endif /* X11 */
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||
#include <machine/apm_bios.h>
|
||||
#endif /* __FreeBSD__ */
|
||||
|
||||
@ -360,7 +360,7 @@ void update_seti();
|
||||
#endif
|
||||
|
||||
/* in freebsd.c */
|
||||
#ifdef __FreeBSD__
|
||||
#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
|
||||
int apm_getinfo(int fd, apm_info_t aip);
|
||||
char *get_apm_adapter(void);
|
||||
char *get_apm_battery_life(void);
|
||||
|
@ -590,6 +590,7 @@ inline void proc_find_top(struct process **cpu, struct process **mem)
|
||||
return;
|
||||
}
|
||||
|
||||
#if defined(i386) || defined(__i386__)
|
||||
#define APMDEV "/dev/apm"
|
||||
#define APM_UNKNOWN 255
|
||||
|
||||
@ -706,3 +707,4 @@ char *get_apm_battery_time()
|
||||
|
||||
return out;
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user