From 73b7ec00ff9412365629b3dc57440e6402d66a1a Mon Sep 17 00:00:00 2001 From: mmdolze Date: Sun, 22 Nov 2009 15:15:53 +0000 Subject: [PATCH] Introduce shared/defines.h to collect commonly used macros. For now it defines min() / max() macros. --- ChangeLog | 1 + clients/lcdproc/main.h | 10 ++-------- clients/lcdvc/lcdvc.h | 4 ++-- server/drivers/pylcd.c | 6 +++--- server/drivers/sed1330.c | 3 --- server/main.c | 2 +- server/menu.h | 3 --- server/menuitem.c | 1 + server/menuitem.h | 3 --- server/render.c | 2 +- shared/Makefile.am | 2 +- shared/defines.h | 23 +++++++++++++++++++++++ 12 files changed, 35 insertions(+), 25 deletions(-) create mode 100644 shared/defines.h diff --git a/ChangeLog b/ChangeLog index fb45cda..6c167e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ v.0.5dev (ongoing development) * configure: Fix de-selecting of drivers * Build system: Add a check testing if SA_RESTART flag is available. * picolcd driver: Fix RC-5 for picoLCD 20x2 (A. van Schie) + * Introduce shared/defines.h to collect commonly used macros v0.5.3 + lcdexec: notification when called program finishes diff --git a/clients/lcdproc/main.h b/clients/lcdproc/main.h index b9de1a2..c1034e4 100644 --- a/clients/lcdproc/main.h +++ b/clients/lcdproc/main.h @@ -1,6 +1,8 @@ #ifndef MAIN_H #define MAIN_H +#include "shared/defines.h" + #ifndef TRUE # define TRUE 1 #endif @@ -61,12 +63,4 @@ const char *get_hostname(void); const char *get_sysname(void); const char *get_sysrelease(void); -#ifndef min -# define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#ifndef max -# define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - #endif diff --git a/clients/lcdvc/lcdvc.h b/clients/lcdvc/lcdvc.h index 69b09c9..6065b95 100644 --- a/clients/lcdvc/lcdvc.h +++ b/clients/lcdvc/lcdvc.h @@ -1,11 +1,11 @@ #ifndef LCDVC_H #define LCDVC_H +#include "shared/defines.h" + #define CHAIN(e,f) { if( e>=0 ) { e=(f); }} #define CHAIN_END(e) { if( e<0 ) { report( RPT_CRIT,"Critical error, abort"); exit(e); }} -#define min(a,b) ((a)<(b))?(a):(b) - #define UNSET_INT -1 #define UNSET_STR "\01" diff --git a/server/drivers/pylcd.c b/server/drivers/pylcd.c index 15a5a74..3b81006 100644 --- a/server/drivers/pylcd.c +++ b/server/drivers/pylcd.c @@ -60,17 +60,17 @@ #include #include #include -#include "lcd.h" -#include "pylcd.h" #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include "shared/defines.h" +#include "lcd.h" +#include "pylcd.h" #include "lcd_lib.h" #include "report.h" -#define min(a, b) ((a)<(b) ? (a) : (b)) #define True 1 #define False 0 diff --git a/server/drivers/sed1330.c b/server/drivers/sed1330.c index 5b46650..3cdc18e 100644 --- a/server/drivers/sed1330.c +++ b/server/drivers/sed1330.c @@ -225,9 +225,6 @@ #include #include -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#define max(a,b) (((a) > (b)) ? (a) : (b)) - // Autorepeat values #define KEYPAD_AUTOREPEAT_DELAY 500 #define KEYPAD_AUTOREPEAT_FREQ 15 diff --git a/server/main.c b/server/main.c index ab5b32a..8203439 100644 --- a/server/main.c +++ b/server/main.c @@ -55,6 +55,7 @@ /* TODO: fill in what to include otherwise */ #include "shared/report.h" +#include "shared/defines.h" #include "drivers.h" #include "sock.h" @@ -70,7 +71,6 @@ #include "drivers.h" #include "main.h" - #if !defined(SYSCONFDIR) # define SYSCONFDIR "/etc" #endif diff --git a/server/menu.h b/server/menu.h index 3042b31..8fec553 100644 --- a/server/menu.h +++ b/server/menu.h @@ -24,9 +24,6 @@ # define false 0 #endif -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#define max(a,b) (((a) > (b)) ? (a) : (b)) - #include "shared/LL.h" /** A Menu is a MenuItem too. diff --git a/server/menuitem.c b/server/menuitem.c index 83f0f7d..bb4cc84 100644 --- a/server/menuitem.c +++ b/server/menuitem.c @@ -19,6 +19,7 @@ #include #include "shared/report.h" +#include "shared/defines.h" #include "menuitem.h" #include "menuscreens.h" diff --git a/server/menuitem.h b/server/menuitem.h index a7ffe80..6f22357 100644 --- a/server/menuitem.h +++ b/server/menuitem.h @@ -35,9 +35,6 @@ # define false 0 #endif -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#define min(a,b) (((a) < (b)) ? (a) : (b)) - /********************************************************************* * Data definitions of the menustuff */ diff --git a/server/render.c b/server/render.c index 2a3e49a..289e791 100644 --- a/server/render.c +++ b/server/render.c @@ -30,6 +30,7 @@ #include "shared/report.h" #include "shared/LL.h" +#include "shared/defines.h" #include "drivers.h" @@ -40,7 +41,6 @@ #define BUFSIZE 1024 /* larger than display width => large enough */ - int heartbeat = HEARTBEAT_OPEN; static int heartbeat_fallback = HEARTBEAT_ON; /* If no heartbeat setting has been set at all */ diff --git a/shared/Makefile.am b/shared/Makefile.am index 6c826c6..4cd3646 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -8,6 +8,6 @@ libLCDstuff_a_LIBADD = @LIBOBJS@ AM_CPPFLAGS = -I$(top_srcdir) -EXTRA_DIST = getopt.c getopt1.c getopt.h +EXTRA_DIST = getopt.c getopt1.c getopt.h defines.h ## EOF diff --git a/shared/defines.h b/shared/defines.h new file mode 100644 index 0000000..c56af9e --- /dev/null +++ b/shared/defines.h @@ -0,0 +1,23 @@ +/** \file shared/defines.h + * Define macros commonly used in other parts of LCDproc. + */ + +/*- + * This file is part of LCDproc. + * + * This file is released under the GNU General Public License. + * Refer to the COPYING file distributed with this package. + */ + +#ifndef SHARED_DEFINES_H +#define SHARED_DEFINES_H + +/* Define min() and max() */ +#ifndef min +# define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif +#ifndef max +# define max(a,b) (((a) > (b)) ? (a) : (b)) +#endif + +#endif