mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from haraldg/portabilityfixes

Browse Source 
Portability fixes
This commit is contained in:
willfe
2016-07-27 10:16:46 -04:00
committed by GitHub
parent 4a1c1443df 23b6c97ea9
commit 80708be8d4
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/lcdproc/machine.h
+1
View File
@@ -12,6 +12,7 @@
#ifndef _lcdproc_machine_h_ #ifndef _lcdproc_machine_h_
#define _lcdproc_machine_h_ #define _lcdproc_machine_h_
#include <time.h>
#include "shared/LL.h" #include "shared/LL.h"
#ifndef LOADAVG_NSTATS #ifndef LOADAVG_NSTATS
server/drivers/hd44780-rpi.c
+1 -1
View File
@@ -285,7 +285,7 @@ lcdrpi_HD44780_close(PrivateData *p)
/* Unmap and free memory */ /* Unmap and free memory */
if (gpio_map != NULL) if (gpio_map != NULL)
munmap((caddr_t) gpio_map, GPIO_BLOCK_SIZE); munmap((void *) gpio_map, GPIO_BLOCK_SIZE);
if (p->rpi_gpio != NULL) if (p->rpi_gpio != NULL)
free(p->rpi_gpio); free(p->rpi_gpio);
p->rpi_gpio = NULL; p->rpi_gpio = NULL;
server/drivers/mtc_s16209x.c
+1
View File
@@ -49,6 +49,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <sys/file.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
server/drivers/rawserial.c
+5 -5
View File
@@ -60,13 +60,13 @@ typedef struct rawserial_private_data {
/** \name Event loop timing. refresh_time and refresh_delta form the /** \name Event loop timing. refresh_time and refresh_delta form the
* event loop timing mechanism for configurable update rates. * event loop timing mechanism for configurable update rates.
*@{*/ *@{*/
uint refresh_time; /**< time at the last screen update */ unsigned int refresh_time; /**< time at the last screen update */
uint refresh_delta; /**< time step to next screen update */ unsigned int refresh_delta; /**< time step to next screen update */
/**@}*/ /**@}*/
} PrivateData; } PrivateData;
/* Local prototypes */ /* Local prototypes */
static uint get_millisecond_time(void); static unsigned int get_millisecond_time(void);
/* Vars for the server core */ /* Vars for the server core */
@@ -303,7 +303,7 @@ rawserial_flush(Driver *drvthis)
PrivateData *p = drvthis->private_data; PrivateData *p = drvthis->private_data;
char out[LCD_MAX_WIDTH * LCD_MAX_HEIGHT]; 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; int t_delta = currentTime - p->refresh_time;
/* /*
@@ -415,7 +415,7 @@ rawserial_get_info(Driver *drvthis)
* *
* \return int with current millisecond time. * \return int with current millisecond time.
*/ */
static uint static unsigned
get_millisecond_time(void) get_millisecond_time(void)
{ {
struct timeval ts; struct timeval ts;