marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from afh/pull/osx

Browse Source 
Mac OS X compatibility changes
This commit is contained in:
Michael Stapelberg 2015-07-07 23:12:13 -07:00
commit 55a23712ad
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -47,8 +47,8 @@ ifeq ($(OS),OpenBSD)
LIBS+=-lossaudio
endif
ifeq ($(OS), NetBSD)
LIBS+= -lprop
ifeq ($(OS),NetBSD)
LIBS+=-lprop
endif
# This probably applies for any pkgsrc based system

5
i3status.c
View File

@ -692,7 +692,12 @@ int main(int argc, char *argv[]) {
* We also align to 60 seconds modulo interval such
* that we start with :00 on every new minute. */
struct timespec ts;
#if defined(__APPLE__)
gettimeofday(&tv, NULL);
ts.tv_sec = tv.tv_sec;
#else
clock_gettime(CLOCK_REALTIME, &ts);
#endif
ts.tv_sec += interval - (ts.tv_sec % interval);
ts.tv_nsec = 0;

3
man/Makefile
View File

@ -1,8 +1,9 @@
all: i3status.1
A2X?=a2x
A2X_FLAGS=
i3status.1: asciidoc.conf i3status.man
${A2X} -f manpage --asciidoc-opts="-f asciidoc.conf" i3status.man
${A2X} -f manpage --asciidoc-opts="-f asciidoc.conf" ${A2X_FLAGS} i3status.man
clean:
rm -f i3status.xml i3status.1 i3status.html

2
src/print_cpu_temperature.c
View File

@ -261,8 +261,8 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
OUTPUT_FULL_TEXT(buffer);
return;
error:
#endif
free(thermal_zone);
#endif
OUTPUT_FULL_TEXT("can't read temp");
(void)fputs("i3status: Cannot read temperature. Verify that you have a thermal zone in /sys/class/thermal or disable the cpu_temperature module in your i3status config.\n", stderr);

6
src/print_disk_info.c
View File

@ -7,7 +7,7 @@
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <sys/types.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__) || defined(__DragonFly__)
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
#include <sys/param.h>
#include <sys/mount.h>
#else
@ -59,7 +59,7 @@ static int print_bytes_human(char *outwalk, uint64_t bytes, const char *prefix_t
* Determines whether remaining bytes are below given threshold.
*
*/
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
static bool below_threshold(struct statfs buf, const char *prefix_type, const char *threshold_type, const double low_threshold) {
#else
static bool below_threshold(struct statvfs buf, const char *prefix_type, const char *threshold_type, const double low_threshold) {
@ -116,7 +116,7 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch
INSTANCE(path);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
struct statfs buf;
if (statfs(path, &buf) == -1)