diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-10-30 17:35:30 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-02 16:23:46 +0100 |
| commit | 20d04774f4ef3f6e38974636e0e36ae0f0b5501f (patch) | |
| tree | 15562cc70bebb87b130ba1ef5218df84f4297c1d /include | |
| parent | 298e476c66fd88d0bc4f0371118652d2b5de4e8a (diff) | |
| download | u-boot-imx-20d04774f4ef3f6e38974636e0e36ae0f0b5501f.zip u-boot-imx-20d04774f4ef3f6e38974636e0e36ae0f0b5501f.tar.gz u-boot-imx-20d04774f4ef3f6e38974636e0e36ae0f0b5501f.tar.bz2 | |
Consolidate MAX/MIN definitions
There were several, now there is one (two if you count the lower-case
versions).
Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | include/usbdcore.h | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/include/common.h b/include/common.h index b8a654a..df64bf0 100644 --- a/include/common.h +++ b/include/common.h @@ -177,6 +177,9 @@ typedef void (interrupt_handler_t)(void *); ({ typeof (X) __x = (X), __y = (Y); \ (__x > __y) ? __x : __y; }) +#define MIN(x, y) min(x, y) +#define MAX(x, y) max(x, y) + /** * container_of - cast a member of a structure out to the containing structure diff --git a/include/usbdcore.h b/include/usbdcore.h index cb2be72..206dbbc 100644 --- a/include/usbdcore.h +++ b/include/usbdcore.h @@ -126,14 +126,6 @@ }) #endif -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#endif - - /* * Structure member address manipulation macros. * These are used by client code (code using the urb_link routines), since |