From 02d2bca3047d91a3ea73af8a0ffe55ce2834bddb Mon Sep 17 00:00:00 2001 From: marschap Date: Sun, 21 Dec 2008 17:24:48 +0000 Subject: [PATCH] rename struct mode to _screen_mode resp. ScreenMode to keep Doxygen happy --- clients/lcdproc/main.c | 4 ++-- clients/lcdproc/main.h | 4 ++-- clients/lcdproc/mode.c | 2 +- clients/lcdproc/mode.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c index 0e4c393..f9c7dd1 100644 --- a/clients/lcdproc/main.c +++ b/clients/lcdproc/main.c @@ -82,8 +82,8 @@ static int process_configfile(char *cfgfile); #define DEFAULT_REPORTDEST RPT_DEST_STDERR #define DEFAULT_REPORTLEVEL RPT_WARNING -/* list of modes to run */ -mode sequence[] = +/* list of screen modes to run */ +ScreenMode sequence[] = { // flags default ACTIVE will run by default // longname which on off inv timer flags diff --git a/clients/lcdproc/main.h b/clients/lcdproc/main.h index fb68ccd..b9de1a2 100644 --- a/clients/lcdproc/main.h +++ b/clients/lcdproc/main.h @@ -30,7 +30,7 @@ extern int lcd_hgt; extern int lcd_cellwid; extern int lcd_cellhgt; -typedef struct mode +typedef struct _screen_mode { char *longname; // Which screen is it? char which; // Which screen is it? @@ -40,7 +40,7 @@ typedef struct mode int timer; // Time since last update int flags; // bit 1 visible, bit 2 selected for display, bit 3 first int (*func)(int,int,int *); // function pointer -} mode; +} ScreenMode; //mode flags #define VISIBLE 0x00000001 //currently visible diff --git a/clients/lcdproc/mode.c b/clients/lcdproc/mode.c index 759ca8f..b0c27c1 100644 --- a/clients/lcdproc/mode.c +++ b/clients/lcdproc/mode.c @@ -41,7 +41,7 @@ mode_close(void) } int -update_screen(mode *m, int display) +update_screen(ScreenMode *m, int display) { static int status = -1; int old_status = status; diff --git a/clients/lcdproc/mode.h b/clients/lcdproc/mode.h index 5387add..7767a22 100644 --- a/clients/lcdproc/mode.h +++ b/clients/lcdproc/mode.h @@ -7,7 +7,7 @@ int mode_init(void); void mode_close(void); -int update_screen(mode * m, int display); +int update_screen(ScreenMode *m, int display); int credit_screen(int rep, int display, int *flags_ptr);