Delete or rename MIN/MAX macros and defines

Include <sys/param.h> if necessary to get the MIN()/MAX() macros.

5 files changed, 16 insertions, 20 deletions

diff --git a/testsuites/psxtests/psxaio02/init.c b/testsuites/psxtests/psxaio02/init.c
index 89c42342a9..3c75a365b5 100644
--- a/testsuites/psxtests/psxaio02/init.c
+++ b/testsuites/psxtests/psxaio02/init.c
@@ -30,7 +30,7 @@ struct aiocb *create_aiocb(int fd);
 void free_aiocb(struct aiocb *aiocbp);
 
 #define BUFSIZE 32
-#define MAX 10
+#define FD_COUNT 10
 #define WRONG_FD 666
 
 struct aiocb *
@@ -59,8 +59,8 @@ free_aiocb (struct aiocb *aiocbp)
 void *
 POSIX_Init (void *argument)
 {
-  int fd[MAX];
-  struct aiocb *aiocbp[MAX+1];
+  int fd[FD_COUNT];
+  struct aiocb *aiocbp[FD_COUNT+1];
   int status, i, policy = SCHED_FIFO;
   char filename[BUFSIZE];
   struct sched_param param;
@@ -79,7 +79,7 @@ POSIX_Init (void *argument)
   
   puts ("Init: Open files");
 
-  for (i=0; i<MAX; i++)
+  for (i=0; i<FD_COUNT; i++)
     {
       sprintf (filename, "/tmp/aio_fildes%d",i);
       fd[i] = open (filename, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
@@ -175,7 +175,7 @@ POSIX_Init (void *argument)
 
   TEST_END();
 
-  for (i = 0; i < MAX; i++)
+  for (i = 0; i < FD_COUNT; i++)
     {
       close (fd[i]);
       free_aiocb (aiocbp[i]);      
diff --git a/testsuites/psxtests/psxaio03/init.c b/testsuites/psxtests/psxaio03/init.c
index eed3d4ea8f..d8a13fa8e4 100644
--- a/testsuites/psxtests/psxaio03/init.c
+++ b/testsuites/psxtests/psxaio03/init.c
@@ -30,7 +30,7 @@ const char rtems_test_name[] = "PSXAIO 3";
 struct aiocb *create_aiocb(int fd);
 void free_aiocb(struct aiocb *aiocbp);
 
-#define MAX 6
+#define FD_COUNT 6
 #define BUFSIZE 128
 
 struct aiocb *
@@ -60,8 +60,8 @@ free_aiocb (struct aiocb *aiocbp)
 void *
 POSIX_Init (void *argument)
 {
-  int fd[MAX];
-  struct aiocb *aiocbp[MAX+1];
+  int fd[FD_COUNT];
+  struct aiocb *aiocbp[FD_COUNT+1];
   int status, i, policy = SCHED_FIFO;
   char filename[BUFSIZE];
   struct sched_param param;
@@ -80,7 +80,7 @@ POSIX_Init (void *argument)
 
   puts (" Init: Open files ");
 
-  for (i=0; i<MAX; i++)
+  for (i=0; i<FD_COUNT; i++)
     {
       sprintf (filename, "/tmp/aio_fildes%d",i);
       fd[i] = open (filename, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
@@ -131,7 +131,7 @@ POSIX_Init (void *argument)
   
   TEST_END();
   
-  for (i = 0; i < MAX; i++)
+  for (i = 0; i < FD_COUNT; i++)
     {
       close (fd[i]);
       free_aiocb (aiocbp[i]);
diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c
index 4dd00ed7a7..07ec2c66c3 100644
--- a/testsuites/samples/fileio/init.c
+++ b/testsuites/samples/fileio/init.c
@@ -13,6 +13,7 @@
 
 #define CONFIGURE_INIT
 #include "system.h"
+#include <sys/param.h>
 #include <crypt.h>
 #include <stdio.h>
 #include <string.h>
@@ -214,10 +215,6 @@ fstab_t fs_table[] = {
   }
 };
 
-#ifndef MIN
-#define MIN(a,b) (((a) > (b)) ? (b) : (a))
-#endif
-
 #define USE_SHELL
 
 #ifdef USE_SHELL
diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c
index e1055285ab..701aa17035 100644
--- a/testsuites/sptests/sp48/init.c
+++ b/testsuites/sptests/sp48/init.c
@@ -20,8 +20,8 @@ const char rtems_test_name[] = "SP 48";
 
 rtems_task Init(rtems_task_argument ignored);
 
-#define MAX 5000
-rtems_id Semaphores[MAX];
+#define SEMA_COUNT 5000
+rtems_id Semaphores[SEMA_COUNT];
 
 rtems_task Init(rtems_task_argument ignored)
 {
@@ -35,7 +35,7 @@ rtems_task Init(rtems_task_argument ignored)
     "Largest C program heap block available: %zu\n",
     malloc_free_space()
   );
-  for (i=0 ; i<MAX ; i++ ) {
+  for (i=0 ; i<SEMA_COUNT ; i++ ) {
     sc = rtems_semaphore_create(
       rtems_build_name('s', 'e', 'm', ' '),
       1,
@@ -57,7 +57,7 @@ rtems_task Init(rtems_task_argument ignored)
   }
 
   created = i;
-  if ( created == MAX )
+  if ( created == SEMA_COUNT )
     puts( "Created all semaphores allowed in this test" );
 
   printf( "%d semaphores created\n", i );
diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
index 9b6dd6f598..6f1c837d84 100644
--- a/testsuites/sptests/sp63/init.c
+++ b/testsuites/sptests/sp63/init.c
@@ -23,8 +23,7 @@ void test_case_one(void);
 void test_case_two(void);
 void test_case_three(void);
 
-#define MAX 256
-uint32_t      Memory[MAX];
+uint32_t      Memory[256];
 Heap_Control  Heap;
 
 /*