diff -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/server/drivers/pylcd.c ./server/drivers/pylcd.c --- ../lcdproc-exp/server/drivers/pylcd.c 2009-05-21 23:13:22.000000000 +0200 +++ ./server/drivers/pylcd.c 2009-11-01 17:56:40.000000000 +0100 @@ -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 -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/server/drivers/sed1330.c ./server/drivers/sed1330.c --- ../lcdproc-exp/server/drivers/sed1330.c 2009-09-14 21:08:22.000000000 +0200 +++ ./server/drivers/sed1330.c 2009-11-01 17:24:00.000000000 +0100 @@ -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 -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/server/main.c ./server/main.c --- ../lcdproc-exp/server/main.c 2009-11-01 09:38:58.000000000 +0100 +++ ./server/main.c 2009-11-01 17:47:54.000000000 +0100 @@ -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 -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/server/menu.h ./server/menu.h --- ../lcdproc-exp/server/menu.h 2008-11-30 23:31:20.000000000 +0100 +++ ./server/menu.h 2009-11-01 17:35:01.000000000 +0100 @@ -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 -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/server/menuitem.c ./server/menuitem.c --- ../lcdproc-exp/server/menuitem.c 2009-06-06 16:48:48.000000000 +0200 +++ ./server/menuitem.c 2009-11-01 17:49:38.000000000 +0100 @@ -19,6 +19,7 @@ #include #include "shared/report.h" +#include "shared/defines.h" #include "menuitem.h" #include "menuscreens.h" diff -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/server/menuitem.h ./server/menuitem.h --- ../lcdproc-exp/server/menuitem.h 2008-11-30 23:31:20.000000000 +0100 +++ ./server/menuitem.h 2009-11-01 17:35:59.000000000 +0100 @@ -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 -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/server/render.c ./server/render.c --- ../lcdproc-exp/server/render.c 2009-11-01 09:32:50.000000000 +0100 +++ ./server/render.c 2009-11-01 17:50:01.000000000 +0100 @@ -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 -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/shared/Makefile.am ./shared/Makefile.am --- ../lcdproc-exp/shared/Makefile.am 2009-07-07 23:38:51.000000000 +0200 +++ ./shared/Makefile.am 2009-11-01 17:53:28.000000000 +0100 @@ -8,6 +8,6 @@ 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 -urN -X diff_ignore -x diff_ignore ../lcdproc-exp/shared/defines.h ./shared/defines.h --- ../lcdproc-exp/shared/defines.h 1970-01-01 01:00:00.000000000 +0100 +++ ./shared/defines.h 2009-11-01 17:51:23.000000000 +0100 @@ -0,0 +1,16 @@ +/** \file shared/defines.h + * Contains useful defines which are defined globally. + */ + +#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