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 /cpukit/libfs | |
| 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 '')
| -rw-r--r-- | cpukit/libfs/src/dosfs/fat.h | 5 | ||||
| -rw-r--r-- | cpukit/libfs/src/imfs/imfs_load_tar.c | 3 | ||||
| -rw-r--r-- | cpukit/libfs/src/pipe/fifo.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/cpukit/libfs/src/dosfs/fat.h b/cpukit/libfs/src/dosfs/fat.h index 26f0699e78..6b866794e1 100644 --- a/cpukit/libfs/src/dosfs/fat.h +++ b/cpukit/libfs/src/dosfs/fat.h @@ -22,6 +22,7 @@ #ifndef __DOSFS_FAT_H__ #define __DOSFS_FAT_H__ +#include <sys/param.h> #include <string.h> #include <rtems/seterr.h> @@ -68,10 +69,6 @@ extern "C" { # define CT_LE_L(v) (v) #endif -#ifndef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#endif - #define FAT_HASH_SIZE 2 #define FAT_HASH_MODULE FAT_HASH_SIZE diff --git a/cpukit/libfs/src/imfs/imfs_load_tar.c b/cpukit/libfs/src/imfs/imfs_load_tar.c index 0c4bb66a92..5b6f545f4c 100644 --- a/cpukit/libfs/src/imfs/imfs_load_tar.c +++ b/cpukit/libfs/src/imfs/imfs_load_tar.c @@ -20,6 +20,7 @@ #include "imfs.h" +#include <sys/param.h> #include <sys/stat.h> #include <string.h> #include <tar.h> @@ -28,8 +29,6 @@ #define MAX_NAME_FIELD_SIZE 99 -#define MIN(a,b) ((a)>(b)?(b):(a)) - int rtems_tarfs_load( const char *mountpoint, uint8_t *tar_image, diff --git a/cpukit/libfs/src/pipe/fifo.c b/cpukit/libfs/src/pipe/fifo.c index 2c8eb991f0..203b65480a 100644 --- a/cpukit/libfs/src/pipe/fifo.c +++ b/cpukit/libfs/src/pipe/fifo.c @@ -18,6 +18,7 @@ #include "config.h" #endif +#include <sys/param.h> #include <errno.h> #include <stdlib.h> #include <string.h> @@ -29,9 +30,6 @@ #include "pipe.h" - -#define MIN(a, b) ((a) < (b)? (a): (b)) - #define LIBIO_ACCMODE(_iop) ((_iop)->flags & LIBIO_FLAGS_READ_WRITE) #define LIBIO_NODELAY(_iop) ((_iop)->flags & LIBIO_FLAGS_NO_DELAY) |