diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c index c421328a4..398a787a9 100644 --- a/examples/ajoystick/ajoy_main.c +++ b/examples/ajoystick/ajoy_main.c @@ -59,7 +59,6 @@ #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif - #ifndef MAX # define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c index 54d72d9e1..39f809782 100644 --- a/examples/djoystick/djoy_main.c +++ b/examples/djoystick/djoy_main.c @@ -56,7 +56,6 @@ #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif - #ifndef MAX # define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif diff --git a/examples/nunchuck/nunchuck_main.c b/examples/nunchuck/nunchuck_main.c index c0e1a2059..2e28ebbc7 100644 --- a/examples/nunchuck/nunchuck_main.c +++ b/examples/nunchuck/nunchuck_main.c @@ -55,7 +55,6 @@ #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif - #ifndef MAX # define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c index c96f8b24b..a7dc72b56 100644 --- a/examples/zerocross/zerocross_main.c +++ b/examples/zerocross/zerocross_main.c @@ -56,7 +56,6 @@ #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif - #ifndef MAX # define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c index b4009d28a..30ea11411 100644 --- a/netutils/thttpd/libhttpd.c +++ b/netutils/thttpd/libhttpd.c @@ -95,6 +95,7 @@ extern CODE char *crypt(const char *key, const char *setting); #ifndef MAX # define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif + #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif diff --git a/netutils/thttpd/libhttpd.h b/netutils/thttpd/libhttpd.h index 4422fcf07..fd0e657e8 100644 --- a/netutils/thttpd/libhttpd.h +++ b/netutils/thttpd/libhttpd.h @@ -55,13 +55,21 @@ #include #include "config.h" - #ifdef CONFIG_THTTPD /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ +/* A few convenient defines. */ + +#ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif +#ifndef MIN +# define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif + /* Enable special instrumentation to track down "400 Bad Request" problems */ #undef CONFIG_THTTPD_BADREQUEST /* Define to enable "Bad Request" instrumentation */