// vim:ts=4:sw=4:expandtab
+#include <config.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include "i3status.h"
-#if defined(LINUX)
+#if defined(__linux__)
#include <errno.h>
#include <glob.h>
#include <sys/types.h>
}
#endif
-#if defined(LINUX) || defined(__NetBSD__)
+#if defined(__linux__) || defined(__NetBSD__)
/*
* Add batt_info data to acc.
*/
static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen, char *buffer, int number, const char *path, const char *format_down) {
char *outwalk = buffer;
-#if defined(LINUX)
+#if defined(__linux__)
char buf[1024];
const char *walk, *last;
bool watt_as_unit = false;
batt_info->status = CS_CHARGING;
else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Full"))
batt_info->status = CS_FULL;
- else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Discharging"))
+ else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Discharging") || BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Not charging"))
batt_info->status = CS_DISCHARGING;
else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS="))
batt_info->status = CS_UNKNOWN;
* Returns false on error, and an error message will have been written.
*/
static bool slurp_all_batteries(struct battery_info *batt_info, yajl_gen json_gen, char *buffer, const char *path, const char *format_down) {
-#if defined(LINUX)
+#if defined(__linux__)
char *outwalk = buffer;
bool is_found = false;