From f355e233714e6ff38a38ccfe74f2f42d65a519c8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 5 Mar 2016 12:07:04 +0100 Subject: [PATCH] add ifdefs to make system.c compile on non-linux systems Signed-off-by: Felix Fietkau --- system.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/system.c b/system.c index fb7fbe4..504cdc0 100644 --- a/system.c +++ b/system.c @@ -13,7 +13,9 @@ */ #include +#ifdef linux #include +#endif #include #include #include @@ -186,24 +188,28 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { - void *c; time_t now; struct tm *tm; +#ifdef linux struct sysinfo info; + void *c; + + if (sysinfo(&info)) + return UBUS_STATUS_UNKNOWN_ERROR; +#endif now = time(NULL); if (!(tm = localtime(&now))) return UBUS_STATUS_UNKNOWN_ERROR; - if (sysinfo(&info)) - return UBUS_STATUS_UNKNOWN_ERROR; - blob_buf_init(&b, 0); - blobmsg_add_u32(&b, "uptime", info.uptime); blobmsg_add_u32(&b, "localtime", mktime(tm)); +#ifdef linux + blobmsg_add_u32(&b, "uptime", info.uptime); + c = blobmsg_open_array(&b, "load"); blobmsg_add_u32(&b, NULL, info.loads[0]); blobmsg_add_u32(&b, NULL, info.loads[1]); @@ -221,6 +227,7 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_u64(&b, "total", info.mem_unit * info.totalswap); blobmsg_add_u64(&b, "free", info.mem_unit * info.freeswap); blobmsg_close_table(&b, c); +#endif ubus_send_reply(ctx, req, b.head); -- 2.11.0