nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

etend OpenBSD patch to FreeBSD and NetBSD

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@462 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77 2010-05-18 16:03:54 +00:00
parent f13a7a13cb
commit 642abfc7e0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/battery/battery.c
View file

@ -24,7 +24,7 @@
#include <cairo-xlib.h> #include <cairo-xlib.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
#include <machine/apmvar.h> #include <machine/apmvar.h>
#include <err.h> #include <err.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -58,7 +58,7 @@ char *path_energy_full;
char *path_current_now; char *path_current_now;
char *path_status; char *path_status;
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
int apm_fd; int apm_fd;
#endif #endif
@ -102,7 +102,7 @@ void default_battery()
path_energy_full = 0; path_energy_full = 0;
path_current_now = 0; path_current_now = 0;
path_status = 0; path_status = 0;
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
apm_fd = -1; apm_fd = -1;
#endif #endif
} }
@ -117,7 +117,7 @@ void cleanup_battery()
if (path_status) g_free(path_status); if (path_status) g_free(path_status);
if (battery_low_cmd) g_free(battery_low_cmd); if (battery_low_cmd) g_free(battery_low_cmd);
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
if ((apm_fd != -1) && (close(apm_fd) == -1)) if ((apm_fd != -1) && (close(apm_fd) == -1))
warn("cannot close /dev/apm"); warn("cannot close /dev/apm");
#endif #endif
@ -128,7 +128,7 @@ void init_battery()
{ {
if (!battery_enabled) return; if (!battery_enabled) return;
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
apm_fd = open("/dev/apm", O_RDONLY); apm_fd = open("/dev/apm", O_RDONLY);
if (apm_fd < 0) { if (apm_fd < 0) {
warn("init_battery: failed to open /dev/apm."); warn("init_battery: failed to open /dev/apm.");
@ -257,7 +257,7 @@ void init_battery_panel(void *p)
void update_battery() { void update_battery() {
#if !defined(__OpenBSD__) #if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
// unused on OpenBSD, silence compiler warnings // unused on OpenBSD, silence compiler warnings
FILE *fp; FILE *fp;
char tmp[25]; char tmp[25];
@ -267,7 +267,7 @@ void update_battery() {
int seconds = 0; int seconds = 0;
int8_t new_percentage = 0; int8_t new_percentage = 0;
#if defined(__OpenBSD__) #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
struct apm_power_info info; struct apm_power_info info;
if (ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) < 0) if (ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) < 0)
warn("power update: APM_IOC_GETPOWER"); warn("power update: APM_IOC_GETPOWER");