diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-11-21 08:49:57 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-11-21 08:52:29 +0100 |
| commit | 11925eef789566a226d8eaacbceb4d89df787ebc (patch) | |
| tree | d9012073fa76528fd205eed96cc016d566f7c89d /c | |
| parent | smpschedaffinity05: Change semaphore attributes. (diff) | |
| download | rtems-11925eef789566a226d8eaacbceb4d89df787ebc.tar.bz2 | |
Delete or rename MIN/MAX macros and defines
Include <sys/param.h> if necessary to get the MIN()/MAX() macros.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c | 2 | ||||
| -rw-r--r-- | c/src/libchip/ide/ata_internal.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c index 9420b4edec..e1e9e7d8f6 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c +++ b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c @@ -75,6 +75,7 @@ /* */ /***********************************************************************/ +#include <sys/param.h> #include <rtems.h> #include <rtems/error.h> #include <rtems/score/sysstate.h> @@ -88,9 +89,6 @@ #include <libchip/ide_ctrl_io.h> #include <string.h> -#ifndef MIN -#define MIN(a,b) (((a)<(b))?(a):(b)) -#endif #define IDE_DMA_TEST FALSE /* DMA supported PIO mode is broken */ diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c index 2b5295b176..fbabe98598 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c @@ -900,8 +900,6 @@ static int txq_high_limit(struct GTeth_softc *sc) } #endif -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) - static int GT64260eth_sendpacket(struct GTeth_softc *sc,struct mbuf *m) { volatile struct GTeth_desc *txd = &sc->txq_desc[sc->txq_lo]; diff --git a/c/src/libchip/ide/ata_internal.h b/c/src/libchip/ide/ata_internal.h index 94b8890f1d..887199d213 100644 --- a/c/src/libchip/ide/ata_internal.h +++ b/c/src/libchip/ide/ata_internal.h @@ -15,6 +15,7 @@ #ifndef __ATA_INTERNAL_H__ #define __ATA_INTERNAL_H__ +#include <sys/param.h> #include <rtems.h> #include <sys/types.h> #include <rtems/libio.h> @@ -45,7 +46,6 @@ extern "C" { # define CT_LE_L(v) (v) #endif -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define ATA_UNDEFINED_VALUE (-1) /* Sector size for all ATA devices */ |