From 63568547d91261854dd91025dc87eb1ddaad7ffe Mon Sep 17 00:00:00 2001 From: Harald Geyer Date: Wed, 21 Oct 2015 18:04:52 +0200 Subject: [PATCH 1/4] clients/lcdproc/machine.h: Include missing header file This file uses time_t and thus must include time.h Signed-off-by: Harald Geyer --- clients/lcdproc/machine.h | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/lcdproc/machine.h b/clients/lcdproc/machine.h index 7618c39..86c3fc9 100644 --- a/clients/lcdproc/machine.h +++ b/clients/lcdproc/machine.h @@ -12,6 +12,7 @@ #ifndef _lcdproc_machine_h_ #define _lcdproc_machine_h_ +#include #include "shared/LL.h" #ifndef LOADAVG_NSTATS From f73d2aca1eb87b1fc5c18e35824202c502676dde Mon Sep 17 00:00:00 2001 From: Harald Geyer Date: Wed, 4 Nov 2015 13:17:31 +0100 Subject: [PATCH 2/4] hd44780-rpi.c: Get rid of non-standard pointer type The old code didn't compile against musl libc (OpenWRT). Compiletested on ARM. Signed-off-by: Harald Geyer --- server/drivers/hd44780-rpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/drivers/hd44780-rpi.c b/server/drivers/hd44780-rpi.c index 5ef9d18..53388eb 100644 --- a/server/drivers/hd44780-rpi.c +++ b/server/drivers/hd44780-rpi.c @@ -285,7 +285,7 @@ lcdrpi_HD44780_close(PrivateData *p) /* Unmap and free memory */ if (gpio_map != NULL) - munmap((caddr_t) gpio_map, GPIO_BLOCK_SIZE); + munmap((void *) gpio_map, GPIO_BLOCK_SIZE); if (p->rpi_gpio != NULL) free(p->rpi_gpio); p->rpi_gpio = NULL; From bb7badfee20eb67c7f8bfaa5a5ad30014fc3b004 Mon Sep 17 00:00:00 2001 From: Harald Geyer Date: Wed, 4 Nov 2015 13:28:39 +0100 Subject: [PATCH 3/4] mtc_s16209x.c: Add missing header file This driver uses flock(2) und thus must include sys/file.h Signed-off-by: Harald Geyer --- server/drivers/mtc_s16209x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/drivers/mtc_s16209x.c b/server/drivers/mtc_s16209x.c index 55e48e7..fda30f8 100644 --- a/server/drivers/mtc_s16209x.c +++ b/server/drivers/mtc_s16209x.c @@ -49,6 +49,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H # include "config.h" From 23b6c97ea99e280f9573215c41871d98590a426a Mon Sep 17 00:00:00 2001 From: Harald Geyer Date: Wed, 4 Nov 2015 13:31:12 +0100 Subject: [PATCH 4/4] rawserial.c: Get rid of non-standard type Looks like uint isn't supported by MUSL libc used by OpenWRT. Signed-off-by: Harald Geyer --- server/drivers/rawserial.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/drivers/rawserial.c b/server/drivers/rawserial.c index 433273a..e05ffb4 100644 --- a/server/drivers/rawserial.c +++ b/server/drivers/rawserial.c @@ -60,13 +60,13 @@ typedef struct rawserial_private_data { /** \name Event loop timing. refresh_time and refresh_delta form the * event loop timing mechanism for configurable update rates. *@{*/ - uint refresh_time; /**< time at the last screen update */ - uint refresh_delta; /**< time step to next screen update */ + unsigned int refresh_time; /**< time at the last screen update */ + unsigned int refresh_delta; /**< time step to next screen update */ /**@}*/ } PrivateData; /* Local prototypes */ -static uint get_millisecond_time(void); +static unsigned int get_millisecond_time(void); /* Vars for the server core */ @@ -303,7 +303,7 @@ rawserial_flush(Driver *drvthis) PrivateData *p = drvthis->private_data; char out[LCD_MAX_WIDTH * LCD_MAX_HEIGHT]; - uint currentTime = get_millisecond_time(); + unsigned int currentTime = get_millisecond_time(); int t_delta = currentTime - p->refresh_time; /* @@ -415,7 +415,7 @@ rawserial_get_info(Driver *drvthis) * * \return int with current millisecond time. */ -static uint +static unsigned get_millisecond_time(void) { struct timeval ts;